From cb51a44c9a09089cbb45096740ec19beaf1560d4 Mon Sep 17 00:00:00 2001 From: MD NADEEM Date: Tue, 6 Sep 2016 12:32:27 +0530 Subject: [PATCH] Replace deprecated rabbitmq parametrs 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 --- ansible/roles/aodh/templates/aodh.conf.j2 | 8 +------- ansible/roles/congress/templates/congress.conf.j2 | 10 +++------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/ansible/roles/aodh/templates/aodh.conf.j2 b/ansible/roles/aodh/templates/aodh.conf.j2 index d432b59025..aee2e16952 100644 --- a/ansible/roles/aodh/templates/aodh.conf.j2 +++ b/ansible/roles/aodh/templates/aodh.conf.j2 @@ -2,15 +2,9 @@ auth_strategy = keystone log_dir = /var/log/kolla/aodh debug = {{ aodh_logging_debug }} -rpc_backend = rabbit notification_topics = notifications -[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 %} - +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 %} [api] port = {{ aodh_api_port }} diff --git a/ansible/roles/congress/templates/congress.conf.j2 b/ansible/roles/congress/templates/congress.conf.j2 index 87985076cd..61bd113159 100644 --- a/ansible/roles/congress/templates/congress.conf.j2 +++ b/ansible/roles/congress/templates/congress.conf.j2 @@ -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 -rpc_backend = rabbit - auth_strategy = keystone os_region_name = {{ openstack_region_name }} @@ -24,6 +22,8 @@ bind_host = {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4'][ bind_port = {{ congress_api_port }} {% 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] connection = mysql+pymysql://{{ congress_database_user }}:{{ congress_database_password }}@{{ congress_database_address }}/{{ congress_database_name }} max_retries = -1 @@ -46,11 +46,7 @@ memcached_servers = {% for host in groups['memcached'] %}{{ hostvars[host]['ansi [congress] 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] driver = noop