diff --git a/deployment/puppet/openstack_tasks/manifests/aodh/aodh.pp b/deployment/puppet/openstack_tasks/manifests/aodh/aodh.pp index b0ff1947e0..681e08506a 100644 --- a/deployment/puppet/openstack_tasks/manifests/aodh/aodh.pp +++ b/deployment/puppet/openstack_tasks/manifests/aodh/aodh.pp @@ -4,18 +4,10 @@ class openstack_tasks::aodh::aodh { $notification_topics = 'notifications' - $rpc_backend = 'rabbit' - $rabbit_ha_queues = hiera('rabbit_ha_queues') $rabbit_hash = hiera_hash('rabbit', {}) - $rabbit_userid = pick($rabbit_hash['user'], 'nova') - $rabbit_password = $rabbit_hash['password'] - $amqp_hosts = hiera('amqp_hosts') - $rabbit_port = hiera('amqp_port') - $rabbit_hosts = split($amqp_hosts, ',') - $rabbit_virtual_host = '/' $kombu_compression = hiera('kombu_compression', $::os_service_default) prepare_network_config(hiera_hash('network_scheme', {})) @@ -54,6 +46,8 @@ class openstack_tasks::aodh::aodh { 'extra' => $extra_params }) + $transport_url = hiera('transport_url','rabbit://guest:password@127.0.0.1:5672/') + $external_lb = hiera('external_lb', false) $public_vip = hiera('public_vip') @@ -106,14 +100,9 @@ class openstack_tasks::aodh::aodh { class { '::aodh': debug => $debug, notification_topics => $notification_topics, - rpc_backend => $rpc_backend, - rabbit_userid => $rabbit_userid, - rabbit_password => $rabbit_password, - rabbit_hosts => $rabbit_hosts, - rabbit_port => $rabbit_port, - rabbit_virtual_host => $rabbit_virtual_host, rabbit_ha_queues => $rabbit_ha_queues, database_connection => $database_connection, + default_transport_url => $transport_url, alarm_history_time_to_live => $alarm_history_ttl, rabbit_heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold, rabbit_heartbeat_rate => $rabbit_heartbeat_rate, diff --git a/deployment/puppet/openstack_tasks/manifests/ceilometer/compute.pp b/deployment/puppet/openstack_tasks/manifests/ceilometer/compute.pp index 27e240a23f..551e9fe3e9 100644 --- a/deployment/puppet/openstack_tasks/manifests/ceilometer/compute.pp +++ b/deployment/puppet/openstack_tasks/manifests/ceilometer/compute.pp @@ -23,8 +23,7 @@ class openstack_tasks::ceilometer::compute { $ceilometer_hash = hiera_hash('ceilometer', $default_ceilometer_hash) $ceilometer_region = pick($ceilometer_hash['region'], $region) $ceilometer_enabled = $ceilometer_hash['enabled'] - $amqp_password = $rabbit_hash['password'] - $amqp_user = $rabbit_hash['user'] + $transport_url = hiera('transport_url','rabbit://guest:password@127.0.0.1:5672/') $kombu_compression = hiera('kombu_compression', $::os_service_default) $ceilometer_metering_secret = $ceilometer_hash['metering_secret'] $debug = pick($ceilometer_hash['debug'], hiera('debug', false)) @@ -48,9 +47,7 @@ class openstack_tasks::ceilometer::compute { http_timeout => $ceilometer_hash['http_timeout'], event_time_to_live => $ceilometer_hash['event_time_to_live'], metering_time_to_live => $ceilometer_hash['metering_time_to_live'], - rabbit_hosts => split(hiera('amqp_hosts',''), ','), - rabbit_userid => $amqp_user, - rabbit_password => $amqp_password, + default_transport_url => $transport_url, metering_secret => $ceilometer_metering_secret, debug => $debug, use_syslog => $use_syslog, @@ -72,8 +69,6 @@ class openstack_tasks::ceilometer::compute { class { '::ceilometer::client': } - - if ($use_syslog) { ceilometer_config { 'DEFAULT/use_syslog_rfc_format': value => true; diff --git a/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp b/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp index 2868b927e7..096b70b9eb 100644 --- a/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp +++ b/deployment/puppet/openstack_tasks/manifests/ceilometer/controller.pp @@ -30,8 +30,7 @@ class openstack_tasks::ceilometer::controller { $ceilometer_enabled = $ceilometer_hash['enabled'] $ceilometer_metering_secret = $ceilometer_hash['metering_secret'] $swift_rados_backend = $storage_hash['objects_ceph'] - $amqp_password = $rabbit_hash['password'] - $amqp_user = $rabbit_hash['user'] + $transport_url = hiera('transport_url','rabbit://guest:password@127.0.0.1:5672/') $service_endpoint = hiera('service_endpoint', $management_vip) $ha_mode = pick($ceilometer_hash['ha_mode'], true) $ssl_hash = hiera_hash('use_ssl', {}) @@ -128,14 +127,12 @@ class openstack_tasks::ceilometer::controller { http_timeout => $ceilometer_hash['http_timeout'], event_time_to_live => $ceilometer_hash['event_time_to_live'], metering_time_to_live => $ceilometer_hash['metering_time_to_live'], - rabbit_hosts => split(hiera('amqp_hosts',''), ','), - rabbit_userid => $amqp_user, - rabbit_password => $amqp_password, metering_secret => $ceilometer_metering_secret, debug => $debug, use_syslog => $use_syslog, use_stderr => $use_stderr, log_facility => $syslog_log_facility, + default_transport_url => $transport_url, kombu_compression => $kombu_compression, rabbit_heartbeat_timeout_threshold => $rabbit_heartbeat_timeout_threshold, rabbit_heartbeat_rate => $rabbit_heartbeat_rate, diff --git a/deployment/puppet/openstack_tasks/manifests/ironic/ironic.pp b/deployment/puppet/openstack_tasks/manifests/ironic/ironic.pp index 2f101169a6..7f9c1bcc97 100644 --- a/deployment/puppet/openstack_tasks/manifests/ironic/ironic.pp +++ b/deployment/puppet/openstack_tasks/manifests/ironic/ironic.pp @@ -17,9 +17,6 @@ class openstack_tasks::ironic::ironic { $use_syslog = hiera('use_syslog', true) $syslog_log_facility_ironic = hiera('syslog_log_facility_ironic', 'LOG_USER') $rabbit_hash = hiera_hash('rabbit', {}) - $amqp_hosts = hiera('amqp_hosts') - $amqp_port = hiera('amqp_port', '5673') - $rabbit_hosts = split($amqp_hosts, ',') $neutron_config = hiera_hash('quantum_settings') $primary_controller = hiera('primary_controller') $amqp_durable_queues = pick($ironic_hash['amqp_durable_queues'], false) @@ -48,6 +45,8 @@ class openstack_tasks::ironic::ironic { 'extra' => $extra_params }) + $transport_url = hiera('transport_url','rabbit://guest:password@127.0.0.1:5672/') + $ironic_tenant = pick($ironic_hash['tenant'],'services') $ironic_user = pick($ironic_hash['auth_name'],'ironic') $ironic_user_password = pick($ironic_hash['user_password'],'ironic') @@ -83,15 +82,12 @@ class openstack_tasks::ironic::ironic { class { '::ironic': debug => $debug, - rabbit_hosts => $rabbit_hosts, - rabbit_port => $amqp_port, - rabbit_userid => $rabbit_hash['user'], - rabbit_password => $rabbit_hash['password'], amqp_durable_queues => $amqp_durable_queues, control_exchange => 'ironic', use_syslog => $use_syslog, log_facility => $syslog_log_facility_ironic, database_connection => $db_connection, + default_transport_url => $transport_url, database_max_retries => '-1', glance_api_servers => $glance_api_servers, sync_db => $primary_controller, diff --git a/deployment/puppet/openstack_tasks/manifests/ironic/ironic_compute.pp b/deployment/puppet/openstack_tasks/manifests/ironic/ironic_compute.pp index 25f7792ca4..f82477acf4 100644 --- a/deployment/puppet/openstack_tasks/manifests/ironic/ironic_compute.pp +++ b/deployment/puppet/openstack_tasks/manifests/ironic/ironic_compute.pp @@ -18,7 +18,6 @@ class openstack_tasks::ironic::ironic_compute { $use_stderr = hiera('use_stderr', false) $syslog_log_facility_ironic = hiera('syslog_log_facility_ironic', 'LOG_LOCAL0') $syslog_log_facility_nova = hiera('syslog_log_facility_nova', 'LOG_LOCAL6') - $amqp_hosts = hiera('amqp_hosts') $rabbit_hash = hiera_hash('rabbit') $nova_report_interval = hiera('nova_report_interval', '60') $nova_service_down_time = hiera('nova_service_down_time', '180') @@ -55,6 +54,8 @@ class openstack_tasks::ironic::ironic_compute { 'extra' => $extra_params }) + $transport_url = hiera('transport_url','rabbit://guest:password@127.0.0.1:5672/') + $notify_on_state_change = 'vm_and_task_state' $ssl_hash = hiera_hash('use_ssl', {}) @@ -91,11 +92,7 @@ class openstack_tasks::ironic::ironic_compute { class { '::nova': ensure_package => installed, database_connection => $db_connection, - rpc_backend => 'nova.openstack.common.rpc.impl_kombu', - #FIXME(bogdando) we have to split amqp_hosts until all modules synced - rabbit_hosts => split($amqp_hosts, ','), - rabbit_userid => $rabbit_hash['user'], - rabbit_password => $rabbit_hash['password'], + default_transport_url => $transport_url, image_service => 'nova.image.glance.GlanceImageService', glance_api_servers => $glance_api_servers, debug => $debug, @@ -138,7 +135,7 @@ class openstack_tasks::ironic::ironic_compute { } class { '::nova::compute::ironic': - max_concurrent_builds => $max_concurrent_builds + max_concurrent_builds => $max_concurrent_builds } class { '::nova::network::neutron': @@ -152,15 +149,15 @@ class openstack_tasks::ironic::ironic_compute { primitive_class => 'ocf', primitive_provider => 'fuel', primitive_type => 'nova-compute', - metadata => { + metadata => { 'resource-stickiness' => '1' }, - parameters => { + parameters => { 'config' => "/etc/nova/nova.conf", 'pid' => "/var/run/nova/nova-compute-ironic.pid", 'additional_parameters' => "--config-file=/etc/nova/nova-compute.conf", }, - operations => { + operations => { monitor => { 'timeout' => '30', 'interval' => '60' }, start => { 'timeout' => '30' }, stop => { 'timeout' => '30' } diff --git a/deployment/puppet/openstack_tasks/manifests/murano/murano.pp b/deployment/puppet/openstack_tasks/manifests/murano/murano.pp index 6709ae214c..dbb202e256 100644 --- a/deployment/puppet/openstack_tasks/manifests/murano/murano.pp +++ b/deployment/puppet/openstack_tasks/manifests/murano/murano.pp @@ -74,6 +74,8 @@ class openstack_tasks::murano::murano { 'extra' => $extra_params }) + $transport_url = hiera('transport_url','rabbit://guest:password@127.0.0.1:5672/') + $external_network = get_ext_net_name($neutron_config['predefined_networks']) $repository_url = has_key($murano_settings_hash, 'murano_repo_url') ? { @@ -120,38 +122,35 @@ class openstack_tasks::murano::murano { } class { '::murano' : - debug => $debug, - use_syslog => $use_syslog, - use_stderr => $use_stderr, - log_facility => $syslog_log_facility_murano, - database_connection => $db_connection, - sync_db => $primary_controller, - auth_uri => "${public_auth_protocol}://${public_auth_address}:5000/", - admin_user => $murano_user, - admin_password => $murano_hash['user_password'], - admin_tenant_name => $tenant, - identity_uri => "${admin_auth_protocol}://${admin_auth_address}:35357/", - notification_driver => $ceilometer_hash['notification_driver'], - use_neutron => true, - packages_service => $packages_service, - rabbit_os_user => $rabbit_hash['user'], - rabbit_os_password => $rabbit_hash['password'], - rabbit_os_port => $amqp_port, - rabbit_os_host => split($amqp_hosts, ','), - rabbit_ha_queues => $rabbit_ha_queues, - rabbit_own_host => $public_ip, - rabbit_own_port => $murano_hash['rabbit']['port'], - rabbit_own_vhost => $murano_hash['rabbit']['vhost'], - rabbit_own_user => pick($murano_hash['rabbit']['user'], 'murano'), - rabbit_own_password => $murano_hash['rabbit_password'], - default_router => 'murano-default-router', - default_nameservers => pick($external_dns['dns_list'], '8.8.8.8'), - service_host => $api_bind_host, - service_port => $api_bind_port, - external_network => $external_network, - use_trusts => true, - kombu_compression => $kombu_compression, - memcached_servers => $local_memcached_server, + debug => $debug, + use_syslog => $use_syslog, + use_stderr => $use_stderr, + log_facility => $syslog_log_facility_murano, + database_connection => $db_connection, + default_transport_url => $transport_url, + sync_db => $primary_controller, + auth_uri => "${public_auth_protocol}://${public_auth_address}:5000/", + admin_user => $murano_user, + admin_password => $murano_hash['user_password'], + admin_tenant_name => $tenant, + identity_uri => "${admin_auth_protocol}://${admin_auth_address}:35357/", + notification_driver => $ceilometer_hash['notification_driver'], + use_neutron => true, + packages_service => $packages_service, + rabbit_ha_queues => $rabbit_ha_queues, + rabbit_own_host => $public_ip, + rabbit_own_port => $murano_hash['rabbit']['port'], + rabbit_own_vhost => $murano_hash['rabbit']['vhost'], + rabbit_own_user => pick($murano_hash['rabbit']['user'], 'murano'), + rabbit_own_password => $murano_hash['rabbit_password'], + default_router => 'murano-default-router', + default_nameservers => pick($external_dns['dns_list'], '8.8.8.8'), + service_host => $api_bind_host, + service_port => $api_bind_port, + external_network => $external_network, + use_trusts => true, + kombu_compression => $kombu_compression, + memcached_servers => $local_memcached_server, } class { '::murano::api': diff --git a/deployment/puppet/openstack_tasks/manifests/roles/ironic_conductor.pp b/deployment/puppet/openstack_tasks/manifests/roles/ironic_conductor.pp index 14f7f509b7..2f6dd04d42 100644 --- a/deployment/puppet/openstack_tasks/manifests/roles/ironic_conductor.pp +++ b/deployment/puppet/openstack_tasks/manifests/roles/ironic_conductor.pp @@ -65,6 +65,8 @@ class openstack_tasks::roles::ironic_conductor { 'extra' => $extra_params }) + $transport_url = hiera('transport_url','rabbit://guest:password@127.0.0.1:5672/') + $tftp_root = '/var/lib/ironic/tftpboot' $temp_url_endpoint_type = $storage_hash['images_ceph'] ? { @@ -89,20 +91,18 @@ class openstack_tasks::roles::ironic_conductor { } class { '::ironic': - debug => $debug, - enabled_drivers => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'], - rabbit_hosts => $rabbit_hosts, - rabbit_userid => $rabbit_hash['user'], - rabbit_password => $rabbit_hash['password'], - amqp_durable_queues => $amqp_durable_queues, - control_exchange => 'ironic', - use_syslog => $use_syslog, - log_facility => $syslog_log_facility_ironic, - database_connection => $db_connection, - database_max_retries => '-1', - sync_db => false, - glance_api_servers => $glance_api_servers, - kombu_compression => $kombu_compression, + debug => $debug, + enabled_drivers => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'], + default_transport_url => $transport_url, + amqp_durable_queues => $amqp_durable_queues, + control_exchange => 'ironic', + use_syslog => $use_syslog, + log_facility => $syslog_log_facility_ironic, + database_connection => $db_connection, + database_max_retries => '-1', + sync_db => false, + glance_api_servers => $glance_api_servers, + kombu_compression => $kombu_compression, } class { '::ironic::client': } diff --git a/deployment/puppet/openstack_tasks/manifests/sahara/sahara.pp b/deployment/puppet/openstack_tasks/manifests/sahara/sahara.pp index f7ffd995ad..99ebf249d5 100644 --- a/deployment/puppet/openstack_tasks/manifests/sahara/sahara.pp +++ b/deployment/puppet/openstack_tasks/manifests/sahara/sahara.pp @@ -20,8 +20,6 @@ class openstack_tasks::sahara::sahara { $use_syslog = hiera('use_syslog', true) $use_stderr = hiera('use_stderr', false) $rabbit_ha_queues = hiera('rabbit_ha_queues') - $amqp_port = hiera('amqp_port') - $amqp_hosts = hiera('amqp_hosts') $external_lb = hiera('external_lb', false) $ssl_hash = hiera_hash('use_ssl', {}) $internal_auth_protocol = get_ssl_property($ssl_hash, {}, 'keystone', 'internal', 'protocol', 'http') @@ -76,6 +74,8 @@ class openstack_tasks::sahara::sahara { 'extra' => $extra_params }) + $transport_url = hiera('transport_url','rabbit://guest:password@127.0.0.1:5672/') + ####### Disable upstart startup on install ####### tweaks::ubuntu_service_override { 'sahara-api': } @@ -98,19 +98,15 @@ class openstack_tasks::sahara::sahara { database_max_overflow => $max_overflow, database_max_retries => $max_retries, database_idle_timeout => $idle_timeout, + default_transport_url => $transport_url, sync_db => $primary_controller, auth_uri => "${internal_auth_url}/v2.0/", identity_uri => $admin_identity_uri, - rpc_backend => 'rabbit', use_neutron => true, admin_user => $sahara_user, admin_password => $sahara_password, admin_tenant_name => $tenant, - rabbit_userid => $rabbit_hash['user'], - rabbit_password => $rabbit_hash['password'], rabbit_ha_queues => $rabbit_ha_queues, - rabbit_port => $amqp_port, - rabbit_hosts => split($amqp_hosts, ','), kombu_compression => $kombu_compression, memcached_servers => $local_memcached_server, } diff --git a/tests/noop/spec/hosts/aodh/aodh_spec.rb b/tests/noop/spec/hosts/aodh/aodh_spec.rb index 9a369f1557..5f93de1628 100644 --- a/tests/noop/spec/hosts/aodh/aodh_spec.rb +++ b/tests/noop/spec/hosts/aodh/aodh_spec.rb @@ -52,11 +52,8 @@ describe manifest do rabbit_ha_queues = Noop.hiera 'rabbit_ha_queues' rabbit_hash = Noop.hiera_hash 'rabbit', {} - rabbit_userid = rabbit_hash.fetch('user', 'nova') - rabbit_password = rabbit_hash['password'] - rabbit_port = Noop.hiera 'amqp_port' - rabbit_hosts = Noop.hiera 'amqp_hosts' + let(:transport_url) { Noop.hiera 'transport_url', 'rabbit://guest:password@127.0.0.1:5672/' } ceilometer_hash = Noop.hiera_structure 'ceilometer', {'alarm_history_time_to_live' => '604800'} alarm_ttl = Noop.puppet_function 'pick', aodh_hash['alarm_history_time_to_live'], ceilometer_hash['alarm_history_time_to_live'] @@ -93,7 +90,7 @@ describe manifest do it 'should configure "DEFAULT/" section ' do should contain_aodh_config('DEFAULT/debug').with(:value => debug) - should contain_aodh_config('DEFAULT/rpc_backend').with(:value => 'rabbit') + should contain_aodh_config('DEFAULT/transport_url').with_value(transport_url) should contain_aodh_config('oslo_messaging_notifications/topics').with(:value => 'notifications') end @@ -128,10 +125,6 @@ describe manifest do it 'should configure "oslo_messaging_rabbit/" section' do should contain_aodh_config('oslo_messaging_rabbit/rabbit_ha_queues').with(:value => rabbit_ha_queues) - should contain_aodh_config('oslo_messaging_rabbit/rabbit_virtual_host').with(:value => '/') - should contain_aodh_config('oslo_messaging_rabbit/rabbit_hosts').with(:value => rabbit_hosts) - should contain_aodh_config('oslo_messaging_rabbit/rabbit_userid').with(:value => rabbit_userid) - should contain_aodh_config('oslo_messaging_rabbit/rabbit_password').with(:value => rabbit_password) end it 'should properly build connection string' do diff --git a/tests/noop/spec/hosts/ceilometer/compute_spec.rb b/tests/noop/spec/hosts/ceilometer/compute_spec.rb index 17d654ca5c..4bfb9d5aad 100644 --- a/tests/noop/spec/hosts/ceilometer/compute_spec.rb +++ b/tests/noop/spec/hosts/ceilometer/compute_spec.rb @@ -26,6 +26,7 @@ describe manifest do keystone_auth_uri = "#{internal_auth_protocol}://#{internal_auth_endpoint}:5000/" kombu_compression = Noop.hiera 'kombu_compression', '' + let(:transport_url) { Noop.hiera 'transport_url', 'rabbit://guest:password@127.0.0.1:5672/' } rabbit_heartbeat_timeout_threshold = Noop.puppet_function 'pick', ceilometer_hash['rabbit_heartbeat_timeout_threshold'], rabbit_hash['heartbeat_timeout_treshold'], 60 rabbit_heartbeat_rate = Noop.puppet_function 'pick', ceilometer_hash['rabbit_heartbeat_rate'], rabbit_hash['heartbeat_rate'], 2 @@ -80,12 +81,14 @@ describe manifest do ) end - it 'should properly configure rabbit queue' do - should contain_ceilometer_config('DEFAULT/rpc_backend').with(:value => 'rabbit') - should contain_ceilometer_config('oslo_messaging_rabbit/rabbit_virtual_host').with(:value => '/') + it 'should properly configure rabbit ssl parameters' do should contain_ceilometer_config('oslo_messaging_rabbit/rabbit_use_ssl').with(:value => 'false') end + it 'should properly configure default transport url' do + should contain_ceilometer_config('DEFAULT/transport_url').with_value(transport_url) + end + it 'should configure kombu compression' do kombu_compression = Noop.hiera 'kombu_compression', facts[:os_service_default] should contain_ceilometer_config('oslo_messaging_rabbit/kombu_compression').with(:value => kombu_compression) diff --git a/tests/noop/spec/hosts/ceilometer/controller_spec.rb b/tests/noop/spec/hosts/ceilometer/controller_spec.rb index f17016cba1..8f5c522bce 100644 --- a/tests/noop/spec/hosts/ceilometer/controller_spec.rb +++ b/tests/noop/spec/hosts/ceilometer/controller_spec.rb @@ -10,8 +10,6 @@ describe manifest do # TODO All this stuff should be moved to shared examples controller* tests. workers_max = Noop.hiera 'workers_max' - rabbit_user = Noop.hiera_structure 'rabbit/user', 'nova' - rabbit_password = Noop.hiera_structure 'rabbit/password' ceilometer_hash = Noop.hiera_structure 'ceilometer' ceilometer_user_password = ceilometer_hash['user_password'] ceilometer_tenant = Noop.hiera_structure('ceilometer/tenant', "services") @@ -54,6 +52,7 @@ describe manifest do keystone_auth_uri = "#{internal_auth_protocol}://#{internal_auth_endpoint}:5000/" kombu_compression = Noop.hiera 'kombu_compression', '' rabbit_hash = Noop.hiera_structure 'rabbit', {} + let(:transport_url) { Noop.hiera 'transport_url', 'rabbit://guest:password@127.0.0.1:5672/' } ssl = 'false' @@ -196,12 +195,14 @@ describe manifest do ) end - it 'should properly configure rabbit queue' do - should contain_ceilometer_config('DEFAULT/rpc_backend').with(:value => 'rabbit') - should contain_ceilometer_config('oslo_messaging_rabbit/rabbit_virtual_host').with(:value => '/') + it 'should properly configure rabbit ssl parameters' do should contain_ceilometer_config('oslo_messaging_rabbit/rabbit_use_ssl').with(:value => 'false') end + it 'should properly configure default transport url' do + should contain_ceilometer_config('DEFAULT/transport_url').with_value(transport_url) + end + it 'should configure kombu compression' do kombu_compression = Noop.hiera 'kombu_compression', facts[:os_service_default] should contain_ceilometer_config('oslo_messaging_rabbit/kombu_compression').with(:value => kombu_compression) diff --git a/tests/noop/spec/hosts/ironic/ironic-compute_spec.rb b/tests/noop/spec/hosts/ironic/ironic-compute_spec.rb index 449b7ceab3..74883f488e 100644 --- a/tests/noop/spec/hosts/ironic/ironic-compute_spec.rb +++ b/tests/noop/spec/hosts/ironic/ironic-compute_spec.rb @@ -54,6 +54,7 @@ describe manifest do let(:glance_endpoint) { Noop.puppet_function 'get_ssl_property',ssl_hash,{},'glance','internal','hostname', glance_endpoint_default } let(:glance_api_servers) { Noop.hiera 'glance_api_servers', "#{glance_protocol}://#{glance_endpoint}:9292" } let(:region_name) { Noop.hiera 'region', 'RegionOne' } + let(:transport_url) { Noop.hiera 'transport_url', 'rabbit://guest:password@127.0.0.1:5672/' } if ironic_enabled @@ -80,6 +81,10 @@ describe manifest do ) end + it 'should properly configure default transport url' do + should contain_nova_config('DEFAULT/transport_url').with_value(transport_url) + end + it 'should configure region name in cinder section' do should contain_nova_config('cinder/os_region_name').with_value(region_name) end @@ -140,6 +145,7 @@ describe manifest do :database_idle_timeout => idle_timeout, :database_max_retries => max_retries, :database_max_pool_size => max_pool_size, + :default_transport_url => transport_url, ) should contain_class('nova::compute').with( :allow_resize_to_same_host => Noop.puppet_function('pick', nova_hash['allow_resize_to_same_host'], true) diff --git a/tests/noop/spec/hosts/ironic/ironic_spec.rb b/tests/noop/spec/hosts/ironic/ironic_spec.rb index 32e486fd1e..382edd5d15 100644 --- a/tests/noop/spec/hosts/ironic/ironic_spec.rb +++ b/tests/noop/spec/hosts/ironic/ironic_spec.rb @@ -10,8 +10,6 @@ if ironic_enabled describe manifest do shared_examples 'catalog' do - rabbit_user = Noop.hiera_structure 'rabbit/user', 'nova' - rabbit_password = Noop.hiera_structure 'rabbit/password' default_log_levels_hash = Noop.hiera_hash 'default_log_levels' default_log_levels = Noop.puppet_function 'join_keys_to_values',default_log_levels_hash,'=' primary_controller = Noop.hiera 'primary_controller' @@ -57,6 +55,8 @@ if ironic_enabled let(:memcached_servers) { Noop.hiera 'memcached_servers' } let(:local_memcached_server) { Noop.hiera 'local_memcached_server' } + let(:transport_url) { Noop.hiera 'transport_url', 'rabbit://guest:password@127.0.0.1:5672/' } + rabbit_heartbeat_timeout_threshold = Noop.puppet_function 'pick', ironic_hash['rabbit_heartbeat_timeout_threshold'], rabbit_hash['heartbeat_timeout_treshold'], 60 rabbit_heartbeat_rate = Noop.puppet_function 'pick', ironic_hash['rabbit_heartbeat_rate'], rabbit_hash['heartbeat_rate'], 2 @@ -81,12 +81,11 @@ if ironic_enabled it 'should declare ironic class correctly' do should contain_class('ironic').with( - 'rabbit_userid' => rabbit_user, - 'rabbit_password' => rabbit_password, - 'sync_db' => primary_controller, - 'control_exchange' => 'ironic', - 'amqp_durable_queues' => amqp_durable_queues, - 'database_max_retries' => '-1', + 'default_transport_url' => transport_url, + 'sync_db' => primary_controller, + 'control_exchange' => 'ironic', + 'amqp_durable_queues' => amqp_durable_queues, + 'database_max_retries' => '-1', ) end @@ -135,6 +134,10 @@ if ironic_enabled ) end + it 'should properly configure default transport url' do + should contain_ironic_config('DEFAULT/transport_url').with_value(transport_url) + end + it 'should configure kombu compression' do kombu_compression = Noop.hiera 'kombu_compression', facts[:os_service_default] should contain_ironic_config('oslo_messaging_rabbit/kombu_compression').with(:value => kombu_compression) diff --git a/tests/noop/spec/hosts/murano/murano_spec.rb b/tests/noop/spec/hosts/murano/murano_spec.rb index 79a26e982c..89a3d2fb1f 100644 --- a/tests/noop/spec/hosts/murano/murano_spec.rb +++ b/tests/noop/spec/hosts/murano/murano_spec.rb @@ -11,8 +11,6 @@ describe manifest do let(:murano_user) { Noop.hiera_structure('murano/user', 'murano') } let(:murano_password) { Noop.hiera_structure('murano/user_password') } let(:tenant) { Noop.hiera_structure('murano/tenant', 'services') } - let(:rabbit_os_user) { Noop.hiera_structure('rabbit/user', 'nova') } - let(:rabbit_os_password) { Noop.hiera_structure('rabbit/password') } let(:rabbit_own_user) { Noop.hiera_structure('murano/rabbit/user', 'murano') } let(:rabbit_own_password) { Noop.hiera_structure('murano/rabbit_password') } @@ -50,8 +48,7 @@ describe manifest do let(:debug) { Noop.hiera('debug', false) } let(:use_syslog) { Noop.hiera('use_syslog', true) } let(:rabbit_ha_queues) { Noop.hiera('rabbit_ha_queues') } - let(:amqp_port) { Noop.hiera('amqp_port') } - let(:amqp_hosts) { Noop.hiera('amqp_hosts') } + let(:transport_url) { Noop.hiera 'transport_url', 'rabbit://guest:password@127.0.0.1:5672/' } let(:public_ssl) { Noop.hiera_structure('public_ssl/services') } let(:db_type) { Noop.hiera_structure('murano/db_type', 'mysql+pymysql') } @@ -166,35 +163,32 @@ describe manifest do it 'should declare murano class correctly' do should contain_class('murano').with( - 'debug' => debug, - 'use_syslog' => use_syslog, - 'use_stderr' => 'false', - 'log_facility' => syslog_log_facility_murano, - 'database_connection' => sql_connection, - 'sync_db' => primary_controller, - 'auth_uri' => "#{public_auth_protocol}://#{public_auth_address}:5000/", - 'admin_user' => murano_user, - 'admin_password' => murano_password, - 'admin_tenant_name' => tenant, - 'identity_uri' => "#{admin_auth_protocol}://#{admin_auth_address}:35357/", - 'notification_driver' => ceilometer_hash['notification_driver'], - 'use_neutron' => 'true', - 'packages_service' => packages_service, - 'rabbit_os_user' => rabbit_os_user, - 'rabbit_os_password' => rabbit_os_password, - 'rabbit_os_port' => amqp_port, - 'rabbit_os_host' => amqp_hosts.split(','), - 'rabbit_ha_queues' => rabbit_ha_queues, - 'rabbit_own_host' => public_ip, - 'rabbit_own_port' => rabbit_own_port, - 'rabbit_own_user' => rabbit_own_user, - 'rabbit_own_password' => rabbit_own_password, - 'rabbit_own_vhost' => rabbit_own_vhost, - 'default_nameservers' => default_dns, - 'service_host' => bind_address, - 'service_port' => api_bind_port, - 'external_network' => external_network, - 'memcached_servers' => local_memcached_server, + 'debug' => debug, + 'use_syslog' => use_syslog, + 'use_stderr' => 'false', + 'log_facility' => syslog_log_facility_murano, + 'database_connection' => sql_connection, + 'default_transport_url' => transport_url, + 'sync_db' => primary_controller, + 'auth_uri' => "#{public_auth_protocol}://#{public_auth_address}:5000/", + 'admin_user' => murano_user, + 'admin_password' => murano_password, + 'admin_tenant_name' => tenant, + 'identity_uri' => "#{admin_auth_protocol}://#{admin_auth_address}:35357/", + 'notification_driver' => ceilometer_hash['notification_driver'], + 'use_neutron' => 'true', + 'packages_service' => packages_service, + 'rabbit_ha_queues' => rabbit_ha_queues, + 'rabbit_own_host' => public_ip, + 'rabbit_own_port' => rabbit_own_port, + 'rabbit_own_user' => rabbit_own_user, + 'rabbit_own_password' => rabbit_own_password, + 'rabbit_own_vhost' => rabbit_own_vhost, + 'default_nameservers' => default_dns, + 'service_host' => bind_address, + 'service_port' => api_bind_port, + 'external_network' => external_network, + 'memcached_servers' => local_memcached_server, ) end diff --git a/tests/noop/spec/hosts/roles/ironic-conductor_spec.rb b/tests/noop/spec/hosts/roles/ironic-conductor_spec.rb index fd5ba3f923..63beb5cb5c 100644 --- a/tests/noop/spec/hosts/roles/ironic-conductor_spec.rb +++ b/tests/noop/spec/hosts/roles/ironic-conductor_spec.rb @@ -6,12 +6,9 @@ manifest = 'roles/ironic-conductor.pp' describe manifest do shared_examples 'catalog' do - rabbit_user = Noop.hiera_structure 'rabbit/user', 'nova' - rabbit_password = Noop.hiera_structure 'rabbit/password' ironic_enabled = Noop.hiera_structure 'ironic/enabled' storage_config = Noop.hiera_structure 'storage' amqp_durable_queues = Noop.hiera_structure 'ironic/amqp_durable_queues', 'false' - database_vip = Noop.hiera('database_vip') ironic_db_type = Noop.hiera_structure 'ironic/db_type', 'mysql+pymysql' ironic_db_password = Noop.hiera_structure 'ironic/db_password', 'ironic' @@ -21,6 +18,7 @@ describe manifest do let(:memcached_servers) { Noop.hiera 'memcached_servers' } let(:local_memcached_server) { Noop.hiera 'local_memcached_server' } + let(:transport_url) { Noop.hiera 'transport_url', 'rabbit://guest:password@127.0.0.1:5672/' } if ironic_enabled it 'should ensure that ironic-fa-deploy is installed' do @@ -29,12 +27,11 @@ describe manifest do it 'should declare ironic class correctly' do should contain_class('ironic').with( - 'rabbit_userid' => rabbit_user, - 'rabbit_password' => rabbit_password, - 'enabled_drivers' => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'], - 'control_exchange' => 'ironic', - 'amqp_durable_queues' => amqp_durable_queues, - 'database_max_retries' => '-1', + 'default_transport_url' => transport_url, + 'enabled_drivers' => ['fuel_ssh', 'fuel_ipmitool', 'fake', 'fuel_libvirt'], + 'control_exchange' => 'ironic', + 'amqp_durable_queues' => amqp_durable_queues, + 'database_max_retries' => '-1', ) end @@ -102,6 +99,7 @@ describe manifest do should contain_ironic_config('keystone_authtoken/admin_user').with('value' => ironic_user) should contain_ironic_config('keystone_authtoken/memcached_servers').with('value' => local_memcached_server) should contain_ironic_config('glance/temp_url_endpoint_type').with('value' => temp_url_endpoint_type) + should contain_ironic_config('DEFAULT/transport_url').with_value(transport_url) end tftp_root = '/var/lib/ironic/tftpboot' diff --git a/tests/noop/spec/hosts/sahara/sahara_spec.rb b/tests/noop/spec/hosts/sahara/sahara_spec.rb index 86a6385820..005cc83f15 100644 --- a/tests/noop/spec/hosts/sahara/sahara_spec.rb +++ b/tests/noop/spec/hosts/sahara/sahara_spec.rb @@ -16,8 +16,6 @@ describe manifest do shared_examples 'catalog' do - let(:rabbit_user) { Noop.hiera_structure 'rabbit/user', 'nova' } - let(:rabbit_password) { Noop.hiera_structure 'rabbit/password' } let(:auth_user) { Noop.hiera_structure 'access/user' } let(:auth_password) { Noop.hiera_structure 'access/password' } let(:auth_tenant) { Noop.hiera_structure 'access/tenant' } @@ -54,6 +52,7 @@ describe manifest do let(:debug) { Noop.hiera('debug', false) } let(:use_syslog) { Noop.hiera('use_syslog', true) } let(:log_facility_sahara) { Noop.hiera('syslog_log_facility_sahara') } + let(:transport_url) { Noop.hiera 'transport_url', 'rabbit://guest:password@127.0.0.1:5672/' } let(:rabbit_ha_queues) { Noop.hiera('rabbit_ha_queues') } let(:public_ssl) { Noop.hiera_structure('public_ssl/services') } @@ -118,7 +117,6 @@ describe manifest do 'auth_uri' => auth_url, 'identity_uri' => admin_uri, 'plugins' => sahara_plugins, - 'rpc_backend' => 'rabbit', 'use_neutron' => true, 'admin_user' => sahara_user, 'debug' => debug, @@ -133,11 +131,8 @@ describe manifest do 'sync_db' => primary_controller, 'admin_password' => sahara_password, 'admin_tenant_name' => tenant, - 'rabbit_userid' => rabbit_user, - 'rabbit_password' => rabbit_password, + 'default_transport_url' => transport_url, 'rabbit_ha_queues' => rabbit_ha_queues, - 'rabbit_port' => amqp_port, - 'rabbit_hosts' => amqp_hosts.split(","), 'host' => bind_address, 'port' => '8386', 'memcached_servers' => local_memcached_server, @@ -200,6 +195,10 @@ describe manifest do end end + it 'should properly configure default transport url' do + should contain_sahara_config('DEFAULT/transport_url').with_value(transport_url) + end + it 'should configure kombu compression' do kombu_compression = Noop.hiera 'kombu_compression', facts[:os_service_default] should contain_sahara_config('oslo_messaging_rabbit/kombu_compression').with(:value => kombu_compression)