openstack/kolla
Code Issues Proposed changes

Replace deprecated rabbitmq parametrs

Browse Source 
This patch replace rabbitmq deprecated
paramters with transport_url.

https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/_drivers/impl_rabbit.py#L112,#L134
https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/transport.py#L46
https://github.com/openstack/oslo.messaging/blob/master/oslo_messaging/_drivers/impl_rabbit.py#L163,L174

Change-Id: Idbac8aefe9b624d4c386283174fd5fd47a1545b2
Closes-Bug: #1620477
This commit is contained in:
MD NADEEM 2016-09-06 12:32:27 +05:30
parent 48ade16227
commit cb51a44c9a
2 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/roles/aodh/templates/aodh.conf.j2
View File

@ -2,15 +2,9 @@
auth_strategy = keystone auth_strategy = keystone
log_dir = /var/log/kolla/aodh log_dir = /var/log/kolla/aodh
debug = {{ aodh_logging_debug }} debug = {{ aodh_logging_debug }}
rpc_backend = rabbit
notification_topics = notifications notification_topics = notifications
[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 %}
rabbit_userid = {{ rabbitmq_user }}
rabbit_password = {{ rabbitmq_password }}
rabbit_ha_queues = true
rabbit_hosts = {% for host in groups['rabbitmq'] %}{{ hostvars[host]['ansible_' + hostvars[host]['api_interface']]['ipv4']['address'] }}:{{ rabbitmq_port }}{% if not loop.last %},{% endif %}{% endfor %}
[api] [api]
port = {{ aodh_api_port }} port = {{ aodh_api_port }}

10
ansible/roles/congress/templates/congress.conf.j2
View File

@ -5,8 +5,6 @@ log_dir = /var/log/kolla/congress
drivers = congress.datasources.neutronv2_driver.NeutronV2Driver,congress.datasources.glancev2_driver.GlanceV2Driver,congress.datasources.nova_driver.NovaDriver,congress.datasources.keystone_driver.KeystoneDriver,congress.datasources.ceilometer_driver.CeilometerDriver,congress.datasources.cinder_driver.CinderDriver,congress.datasources.swift_driver.SwiftDriver,congress.datasources.plexxi_driver.PlexxiDriver,congress.datasources.vCenter_driver.VCenterDriver,congress.datasources.murano_driver.MuranoDriver,congress.datasources.ironic_driver.IronicDriver drivers = congress.datasources.neutronv2_driver.NeutronV2Driver,congress.datasources.glancev2_driver.GlanceV2Driver,congress.datasources.nova_driver.NovaDriver,congress.datasources.keystone_driver.KeystoneDriver,congress.datasources.ceilometer_driver.CeilometerDriver,congress.datasources.cinder_driver.CinderDriver,congress.datasources.swift_driver.SwiftDriver,congress.datasources.plexxi_driver.PlexxiDriver,congress.datasources.vCenter_driver.VCenterDriver,congress.datasources.murano_driver.MuranoDriver,congress.datasources.ironic_driver.IronicDriver
rpc_backend = rabbit
auth_strategy = keystone auth_strategy = keystone
os_region_name = {{ openstack_region_name }} os_region_name = {{ openstack_region_name }}
@ -24,6 +22,8 @@ bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4'][
bind_port = {{ congress_api_port }} bind_port = {{ congress_api_port }}
{% endif %} {% endif %}
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 %}
[database] [database]
connection = mysql+pymysql://{{ congress_database_user }}:{{ congress_database_password }}@{{ congress_database_address }}/{{ congress_database_name }} connection = mysql+pymysql://{{ congress_database_user }}:{{ congress_database_password }}@{{ congress_database_address }}/{{ congress_database_name }}
max_retries = -1 max_retries = -1
@ -46,11 +46,7 @@ memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansi
[congress] [congress]
url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ congress_api_port }} url = {{ internal_protocol }}://{{ kolla_internal_fqdn }}:{{ congress_api_port }}
[oslo_messaging_rabbit]
rabbit_userid = {{ rabbitmq_user }}
rabbit_password = {{ rabbitmq_password }}
rabbit_ha_queues = true
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_messaging_notifications] [oslo_messaging_notifications]
driver = noop driver = noop