RPC_backend / transport_url workover

- removed deprecated rabbitmq attributes
- added rabbit_transport_url

Change-Id: I2560f8010366d9c73fb9d6e2d6f6555d0c4ee7a1

attributes/glance_api_conf.rb

@@ -5,7 +5,6 @@ default['openstack']['image_api']['conf'].tap do |conf|
   else
     conf['DEFAULT']['log_file'] = '/var/log/glance/api.log'
   end
-  conf['DEFAULT']['rpc_backend'] = node['openstack']['mq']['service_type']
 
   # [glance_store] section
   conf['glance_store']['default_store'] = 'file'

attributes/glance_registry_conf.rb

@@ -1,6 +1,5 @@
 default['openstack']['image_registry']['conf'].tap do |conf|
   # [DEFAULT] section
-  conf['DEFAULT']['rpc_backend'] = node['openstack']['mq']['service_type']
   if node['openstack']['image']['syslog']['use']
     conf['DEFAULT']['log_config'] = '/etc/openstack/logging.conf'
   else

recipes/api.rb

@@ -77,13 +77,8 @@ node.default['openstack']['image_api']['conf_secrets']
 .[]('database')['connection'] =
   db_uri('image', db_user, db_pass)
 
-if node['openstack']['image_api']['conf']['DEFAULT']['rpc_backend'] == 'rabbit'
-  user = node['openstack']['mq']['image']['rabbit']['userid']
-  node.default['openstack']['image_api']['conf_secrets']
-  .[]('oslo_messaging_rabbit')['rabbit_userid'] = user
-  node.default['openstack']['image_api']['conf_secrets']
-  .[]('oslo_messaging_rabbit')['rabbit_password'] =
-    get_password 'user', user
+if node['openstack']['mq']['service_type'] == 'rabbit'
+  node.default['openstack']['image_api']['conf_secrets']['DEFAULT']['transport_url'] = rabbit_transport_url 'image'
 end
 
 registry_endpoint = internal_endpoint 'image_registry'

recipes/registry.rb

@@ -35,13 +35,8 @@ db_pass = get_password 'db', 'glance'
 node.default['openstack']['image_registry']['conf_secrets']
   .[]('database')['connection'] = db_uri('image', db_user, db_pass)
 
-if node['openstack']['image_registry']['conf']['DEFAULT']['rpc_backend'] == 'rabbit'
-  user = node['openstack']['mq']['image']['rabbit']['userid']
-  node.default['openstack']['image_registry']['conf_secrets']
-    .[]('oslo_messaging_rabbit')['rabbit_userid'] = user
-  node.default['openstack']['image_registry']['conf_secrets']
-    .[]('oslo_messaging_rabbit')['rabbit_password'] =
-    get_password 'user', user
+if node['openstack']['mq']['service_type'] == 'rabbit'
+  node.default['openstack']['image_registry']['conf_secrets']['DEFAULT']['transport_url'] = rabbit_transport_url 'image'
 end
 
 identity_endpoint = public_endpoint 'identity'

spec/api_spec.rb

@@ -64,7 +64,7 @@ describe 'openstack-image::api' do
       it do
         [
           %r{^log_file = /var/log/glance/api.log$},
-          /^rpc_backend = rabbit$/,
+          %r{^transport_url = rabbit://guest:mypass@127.0.0.1:5672$},
           /^bind_host = 127.0.0.1$/,
           /^bind_port = 9292$/,
           /^registry_host = 127.0.0.1$/,
@@ -119,16 +119,6 @@ describe 'openstack-image::api' do
             .with_section_content('database', line)
         end
       end
-
-      it do
-        [
-          /^rabbit_userid = guest$/,
-          /^rabbit_password = mq-pass$/
-        ].each do |line|
-          expect(chef_run).to render_config_file(file.name)
-            .with_section_content('oslo_messaging_rabbit', line)
-        end
-      end
     end
 
     describe 'glance-cache.conf' do

spec/registry_spec.rb

@@ -67,7 +67,7 @@ describe 'openstack-image::registry' do
       context 'template contents' do
         it do
           [
-            /^rpc_backend = rabbit$/,
+            %r{^transport_url = rabbit://guest:mypass@127.0.0.1:5672$},
             %r{^log_file = /var/log/glance/registry.log$},
             /^bind_port = 9191$/,
             /^bind_host = 127.0.0.1$/
@@ -110,16 +110,6 @@ describe 'openstack-image::registry' do
               .with_section_content('database', line)
           end
         end
-
-        it do
-          [
-            /^rabbit_userid = guest$/,
-            /^rabbit_password = mq-pass$/
-          ].each do |line|
-            expect(chef_run).to render_config_file(file.name)
-              .with_section_content('oslo_messaging_rabbit', line)
-          end
-        end
       end
     end
 

spec/spec_helper.rb

@@ -60,7 +60,9 @@ shared_context 'image-stubs' do
     allow_any_instance_of(Chef::Recipe).to receive(:get_password)
       .with('user', 'admin')
       .and_return('admin-pass')
-
+    allow_any_instance_of(Chef::Recipe).to receive(:rabbit_transport_url)
+      .with('image')
+      .and_return('rabbit://guest:mypass@127.0.0.1:5672')
     allow(Chef::Application).to receive(:fatal!)
     stub_command('glance --insecure --os-username admin --os-password admin-pass --os-project-name admin --os-image-url http://127.0.0.1:9292 --os-auth-url http://127.0.0.1:5000/v3 --os-user-domain-name Default --os-project-domain-name Default image-list | grep cirros').and_return('')
   end