openstack/kolla-ansible
Code Issues Proposed changes

Remove deprecated oslo_messaging_rabbit options

Browse Source 
It's supposed to be working now https://review.openstack.org/475273

Change-Id: I5ae4f5f8ca977f7343cb135e41eb2d0703c37024
Closes-Bug: #1713609
This commit is contained in:
ZhongShengping 2017-08-29 12:05:19 +08:00
parent 26c8137cac
commit 8bff46454e
3 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ansible/roles/designate/templates/designate.conf.j2
View File

@ -93,12 +93,5 @@ formatv6 = '%(hostname)s.%(project)s.%(zone)s'
topics = notifications_designate topics = notifications_designate
driver = messagingv2 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] [oslo_concurrency]
lock_path = /var/lib/designate/tmp lock_path = /var/lib/designate/tmp

3
ansible/roles/karbor/templates/karbor.conf.j2
View File

@ -42,6 +42,3 @@ password = {{ karbor_keystone_password }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} 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 %} 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 %}

4
ansible/roles/solum/templates/solum.conf.j2
View File

@ -1,6 +1,7 @@
[DEFAULT] [DEFAULT]
debug = {{ solum_logging_debug }} debug = {{ solum_logging_debug }}
log_dir = /var/log/kolla/solum 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' %} {% if service_name == 'solum-api' %}
bind_host = {{ api_interface_address }} bind_host = {{ api_interface_address }}
@ -54,6 +55,3 @@ password = {{ solum_keystone_password }}
memcache_security_strategy = ENCRYPT memcache_security_strategy = ENCRYPT
memcache_secret_key = {{ memcache_secret_key }} 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 %} 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 %}