From 9dd38224a9add28b73819e4e06f3bad92d397e28 Mon Sep 17 00:00:00 2001 From: Christoph Albers Date: Fri, 16 Dec 2016 17:11:23 +0100 Subject: [PATCH] RPC_backend / transport_url workover - removed deprecated rabbitmq attributes - added rabbit_transport_url Change-Id: I2560f8010366d9c73fb9d6e2d6f6555d0c4ee7a1 --- attributes/glance_api_conf.rb | 1 - attributes/glance_registry_conf.rb | 1 - recipes/api.rb | 9 ++------- recipes/registry.rb | 9 ++------- spec/api_spec.rb | 12 +----------- spec/registry_spec.rb | 12 +----------- spec/spec_helper.rb | 4 +++- 7 files changed, 9 insertions(+), 39 deletions(-) diff --git a/attributes/glance_api_conf.rb b/attributes/glance_api_conf.rb index b50f501..307743f 100644 --- a/attributes/glance_api_conf.rb +++ b/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' diff --git a/attributes/glance_registry_conf.rb b/attributes/glance_registry_conf.rb index 81bb237..cca828c 100644 --- a/attributes/glance_registry_conf.rb +++ b/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 diff --git a/recipes/api.rb b/recipes/api.rb index ad99d33..a9058b8 100644 --- a/recipes/api.rb +++ b/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' diff --git a/recipes/registry.rb b/recipes/registry.rb index c21a892..c7cde1a 100644 --- a/recipes/registry.rb +++ b/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' diff --git a/spec/api_spec.rb b/spec/api_spec.rb index 8fe45b2..2d82101 100644 --- a/spec/api_spec.rb +++ b/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 diff --git a/spec/registry_spec.rb b/spec/registry_spec.rb index 5ca9a0a..5c35c27 100644 --- a/spec/registry_spec.rb +++ b/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 diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 944e07d..9f6ed90 100644 --- a/spec/spec_helper.rb +++ b/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