From 8bff46454ee9116776d5d5b0a395c39a1e59bf33 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Tue, 29 Aug 2017 12:05:19 +0800 Subject: [PATCH] Remove deprecated oslo_messaging_rabbit options It's supposed to be working now https://review.openstack.org/475273 Change-Id: I5ae4f5f8ca977f7343cb135e41eb2d0703c37024 Closes-Bug: #1713609 --- ansible/roles/designate/templates/designate.conf.j2 | 7 ------- ansible/roles/karbor/templates/karbor.conf.j2 | 3 --- ansible/roles/solum/templates/solum.conf.j2 | 4 +--- 3 files changed, 1 insertion(+), 13 deletions(-) diff --git a/ansible/roles/designate/templates/designate.conf.j2 b/ansible/roles/designate/templates/designate.conf.j2 index cc3c1999a3..ed206052fc 100644 --- a/ansible/roles/designate/templates/designate.conf.j2 +++ b/ansible/roles/designate/templates/designate.conf.j2 @@ -93,12 +93,5 @@ formatv6 = '%(hostname)s.%(project)s.%(zone)s' topics = notifications_designate driver = messagingv2 -# TODO (egonzalez): Currently pool update fail when using transport_url. -# Remove this section after bug https://bugs.launchpad.net/designate/+bug/1673403 is fixed -[oslo_messaging_rabbit] -rabbit_userid = {{ rabbitmq_user }} -rabbit_password = {{ rabbitmq_password }} -rabbit_hosts = {% for host in groups['rabbitmq'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %} - [oslo_concurrency] lock_path = /var/lib/designate/tmp diff --git a/ansible/roles/karbor/templates/karbor.conf.j2 b/ansible/roles/karbor/templates/karbor.conf.j2 index d1a0394e77..8e06f629e2 100644 --- a/ansible/roles/karbor/templates/karbor.conf.j2 +++ b/ansible/roles/karbor/templates/karbor.conf.j2 @@ -42,6 +42,3 @@ password = {{ karbor_keystone_password }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} - -[oslo_messaging_rabbit] -transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %} diff --git a/ansible/roles/solum/templates/solum.conf.j2 b/ansible/roles/solum/templates/solum.conf.j2 index 42f929a718..ce1ce1faf0 100644 --- a/ansible/roles/solum/templates/solum.conf.j2 +++ b/ansible/roles/solum/templates/solum.conf.j2 @@ -1,6 +1,7 @@ [DEFAULT] debug = {{ solum_logging_debug }} log_dir = /var/log/kolla/solum +transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %} {% if service_name == 'solum-api' %} bind_host = {{ api_interface_address }} @@ -54,6 +55,3 @@ password = {{ solum_keystone_password }} memcache_security_strategy = ENCRYPT memcache_secret_key = {{ memcache_secret_key }} memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ memcached_port }}{% if not loop.last %},{% endif %}{% endfor %} - -[oslo_messaging_rabbit] -transport_url = rabbit://{% for host in groups['rabbitmq'] %}{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}