diff --git a/manifests/profile/base/aodh.pp b/manifests/profile/base/aodh.pp index cd2036872..bd9efce7f 100644 --- a/manifests/profile/base/aodh.pp +++ b/manifests/profile/base/aodh.pp @@ -121,6 +121,7 @@ class tripleo::profile::base::aodh ( } include aodh::service_credentials include aodh::config + include aodh::db include aodh::db::sync include aodh::logging } diff --git a/manifests/profile/base/barbican.pp b/manifests/profile/base/barbican.pp index 40a5e7884..fe1fc970b 100644 --- a/manifests/profile/base/barbican.pp +++ b/manifests/profile/base/barbican.pp @@ -31,5 +31,6 @@ class tripleo::profile::base::barbican ( if $step >= 3 { include barbican include barbican::config + include barbican::db } } diff --git a/manifests/profile/base/ceilometer.pp b/manifests/profile/base/ceilometer.pp index 397de1f0f..e37cf0e61 100644 --- a/manifests/profile/base/ceilometer.pp +++ b/manifests/profile/base/ceilometer.pp @@ -112,6 +112,7 @@ class tripleo::profile::base::ceilometer ( } include ceilometer::config + include ceilometer::db include ceilometer::logging } } diff --git a/manifests/profile/base/cinder.pp b/manifests/profile/base/cinder.pp index 42d777f67..5a266ed3e 100644 --- a/manifests/profile/base/cinder.pp +++ b/manifests/profile/base/cinder.pp @@ -123,6 +123,7 @@ class tripleo::profile::base::cinder ( }), } include cinder::config + include cinder::db include cinder::glance include cinder::nova include cinder::logging diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp index 6a10c71fd..00131c92b 100644 --- a/manifests/profile/base/glance/api.pp +++ b/manifests/profile/base/glance/api.pp @@ -211,6 +211,7 @@ class tripleo::profile::base::glance::api ( include glance include glance::config include glance::healthcheck + include glance::api::db include glance::api::logging class { 'glance::api': enabled_backends => $enabled_backends, diff --git a/manifests/profile/base/gnocchi.pp b/manifests/profile/base/gnocchi.pp index 2aa41f183..48e1490bc 100644 --- a/manifests/profile/base/gnocchi.pp +++ b/manifests/profile/base/gnocchi.pp @@ -91,9 +91,9 @@ class tripleo::profile::base::gnocchi ( class { 'gnocchi': coordination_url => join(['redis://:', $gnocchi_redis_password, '@', normalize_ip_for_uri($redis_vip), ':6379/', $tls_query_param]), } - include gnocchi::db include gnocchi::config include gnocchi::cors + include gnocchi::db include gnocchi::logging } } diff --git a/manifests/profile/base/heat.pp b/manifests/profile/base/heat.pp index bdaccbb0a..c1159e2bb 100644 --- a/manifests/profile/base/heat.pp +++ b/manifests/profile/base/heat.pp @@ -150,6 +150,7 @@ class tripleo::profile::base::heat ( include heat::config include heat::cors + include heat::db include heat::logging if is_ipv6_address($memcached_hosts_real[0]) { diff --git a/manifests/profile/base/ironic.pp b/manifests/profile/base/ironic.pp index db235fd38..a4a64d1a5 100644 --- a/manifests/profile/base/ironic.pp +++ b/manifests/profile/base/ironic.pp @@ -84,6 +84,7 @@ class tripleo::profile::base::ironic ( include ironic::config include ironic::cors + include ironic::db include ironic::logging } } diff --git a/manifests/profile/base/ironic_inspector.pp b/manifests/profile/base/ironic_inspector.pp index 41911e21f..562b6a527 100644 --- a/manifests/profile/base/ironic_inspector.pp +++ b/manifests/profile/base/ironic_inspector.pp @@ -80,6 +80,7 @@ class tripleo::profile::base::ironic_inspector ( dnsmasq_ip_subnets => $inspection_subnets_real, } + include ironic::inspector::db include ironic::inspector::pxe_filter include ironic::inspector::pxe_filter::dnsmasq include ironic::config diff --git a/manifests/profile/base/keystone.pp b/manifests/profile/base/keystone.pp index 8819dcb79..2fd9b4fe5 100644 --- a/manifests/profile/base/keystone.pp +++ b/manifests/profile/base/keystone.pp @@ -261,6 +261,7 @@ class tripleo::profile::base::keystone ( } include keystone::config + include keystone::db include keystone::logging include tripleo::profile::base::apache class { 'keystone::wsgi::apache': diff --git a/manifests/profile/base/manila.pp b/manifests/profile/base/manila.pp index 6ed932fe5..06f6f3c01 100644 --- a/manifests/profile/base/manila.pp +++ b/manifests/profile/base/manila.pp @@ -118,6 +118,7 @@ class tripleo::profile::base::manila ( }), } include manila::config + include manila::db include manila::logging } } diff --git a/manifests/profile/base/mistral.pp b/manifests/profile/base/mistral.pp index e8e46e9a9..8bf9a55e6 100644 --- a/manifests/profile/base/mistral.pp +++ b/manifests/profile/base/mistral.pp @@ -119,8 +119,9 @@ class tripleo::profile::base::mistral ( }), } include mistral::config - include mistral::logging - include mistral::db::sync include mistral::cors + include mistral::db + include mistral::db::sync + include mistral::logging } } diff --git a/manifests/profile/base/octavia.pp b/manifests/profile/base/octavia.pp index 254b8d64b..6e2aa43f1 100644 --- a/manifests/profile/base/octavia.pp +++ b/manifests/profile/base/octavia.pp @@ -68,6 +68,7 @@ class tripleo::profile::base::octavia ( }), } include octavia::config + include octavia::db include octavia::logging include octavia::service_auth } diff --git a/manifests/profile/base/placement.pp b/manifests/profile/base/placement.pp index 08b46088b..f09fb6cc1 100644 --- a/manifests/profile/base/placement.pp +++ b/manifests/profile/base/placement.pp @@ -40,7 +40,7 @@ class tripleo::profile::base::placement ( if $step >= 4 or ($step >= 3 and $sync_db) { include placement include placement::config - include placement::logging include placement::db + include placement::logging } } diff --git a/spec/classes/tripleo_profile_base_aodh_spec.rb b/spec/classes/tripleo_profile_base_aodh_spec.rb index 52e3c08ff..87bb982a0 100644 --- a/spec/classes/tripleo_profile_base_aodh_spec.rb +++ b/spec/classes/tripleo_profile_base_aodh_spec.rb @@ -25,6 +25,7 @@ describe 'tripleo::profile::base::aodh' do is_expected.to_not contain_class('aodh') is_expected.to_not contain_class('aodh::service_credentials') is_expected.to_not contain_class('aodh::config') + is_expected.to_not contain_class('aodh::db') is_expected.to_not contain_class('aodh::db::sync') end end @@ -44,6 +45,7 @@ describe 'tripleo::profile::base::aodh' do ) is_expected.to contain_class('aodh::service_credentials') is_expected.to contain_class('aodh::config') + is_expected.to contain_class('aodh::db') is_expected.to contain_class('aodh::db::sync') end end @@ -58,6 +60,7 @@ describe 'tripleo::profile::base::aodh' do is_expected.to_not contain_class('aodh') is_expected.to_not contain_class('aodh::service_credentials') is_expected.to_not contain_class('aodh::config') + is_expected.to_not contain_class('aodh::db') is_expected.to_not contain_class('aodh::db::sync') end end @@ -77,6 +80,7 @@ describe 'tripleo::profile::base::aodh' do ) is_expected.to contain_class('aodh::service_credentials') is_expected.to contain_class('aodh::config') + is_expected.to contain_class('aodh::db') is_expected.to contain_class('aodh::db::sync') end end diff --git a/spec/classes/tripleo_profile_base_barbican_spec.rb b/spec/classes/tripleo_profile_base_barbican_spec.rb index fa3bb164f..4dfaa11d4 100644 --- a/spec/classes/tripleo_profile_base_barbican_spec.rb +++ b/spec/classes/tripleo_profile_base_barbican_spec.rb @@ -24,6 +24,7 @@ describe 'tripleo::profile::base::barbican' do is_expected.to contain_class('tripleo::profile::base::barbican') is_expected.to_not contain_class('barbican') is_expected.to_not contain_class('barbican::config') + is_expected.to_not contain_class('barbican::db') end end @@ -38,6 +39,7 @@ describe 'tripleo::profile::base::barbican' do ) is_expected.to contain_class('barbican') is_expected.to contain_class('barbican::config') + is_expected.to contain_class('barbican::db') end end end diff --git a/spec/classes/tripleo_profile_base_ceilometer_spec.rb b/spec/classes/tripleo_profile_base_ceilometer_spec.rb index bc4ffac98..965ef79e7 100644 --- a/spec/classes/tripleo_profile_base_ceilometer_spec.rb +++ b/spec/classes/tripleo_profile_base_ceilometer_spec.rb @@ -24,6 +24,7 @@ describe 'tripleo::profile::base::ceilometer' do is_expected.to contain_class('tripleo::profile::base::ceilometer') is_expected.to_not contain_class('ceilometer') is_expected.to_not contain_class('ceilometer::config') + is_expected.to_not contain_class('ceilometer::db') end end @@ -40,6 +41,7 @@ describe 'tripleo::profile::base::ceilometer' do :default_transport_url => 'rabbit://ceilometer:foo@127.0.0.1:5672/?ssl=0' ) is_expected.to contain_class('ceilometer::config') + is_expected.to contain_class('ceilometer::db') end end diff --git a/spec/classes/tripleo_profile_base_cinder_spec.rb b/spec/classes/tripleo_profile_base_cinder_spec.rb index bedb918ac..784f37fc9 100644 --- a/spec/classes/tripleo_profile_base_cinder_spec.rb +++ b/spec/classes/tripleo_profile_base_cinder_spec.rb @@ -24,6 +24,7 @@ describe 'tripleo::profile::base::cinder' do is_expected.to contain_class('tripleo::profile::base::cinder') is_expected.to_not contain_class('cinder') is_expected.to_not contain_class('cinder::config') + is_expected.to_not contain_class('cinder::db') is_expected.to_not contain_class('cinder::glance') is_expected.to_not contain_class('cinder::nova') is_expected.to_not contain_class('cinder::logging') @@ -54,6 +55,7 @@ describe 'tripleo::profile::base::cinder' do :notification_transport_url => 'rabbit://cinder2:baa@192.168.0.2:5678/?ssl=0' ) is_expected.to contain_class('cinder::config') + is_expected.to contain_class('cinder::db') is_expected.to contain_class('cinder::glance') is_expected.to contain_class('cinder::nova') is_expected.to contain_class('cinder::logging') @@ -73,6 +75,7 @@ describe 'tripleo::profile::base::cinder' do it 'should not trigger any configuration' do is_expected.to_not contain_class('cinder') is_expected.to_not contain_class('cinder::config') + is_expected.to_not contain_class('cinder::db') is_expected.to_not contain_class('cinder::glance') is_expected.to_not contain_class('cinder::nova') is_expected.to_not contain_class('cinder::logging') @@ -103,6 +106,7 @@ describe 'tripleo::profile::base::cinder' do :notification_transport_url => 'rabbit://cinder2:baa@192.168.0.2:5678/?ssl=0' ) is_expected.to contain_class('cinder::config') + is_expected.to contain_class('cinder::db') is_expected.to contain_class('cinder::glance') is_expected.to contain_class('cinder::nova') is_expected.to contain_class('cinder::logging') @@ -127,6 +131,7 @@ describe 'tripleo::profile::base::cinder' do :default_transport_url => 'rabbit://cinder:foo@127.0.0.1:5672/?ssl=0' ) is_expected.to contain_class('cinder::config') + is_expected.to contain_class('cinder::db') is_expected.to contain_class('cinder::glance') is_expected.to contain_class('cinder::nova') is_expected.to contain_class('cinder::logging') @@ -152,6 +157,7 @@ describe 'tripleo::profile::base::cinder' do :default_transport_url => 'rabbit://cinder:foo@127.0.0.1:5672/?ssl=0' ) is_expected.to contain_class('cinder::config') + is_expected.to contain_class('cinder::db') is_expected.to contain_class('cinder::glance') is_expected.to contain_class('cinder::nova') is_expected.to contain_class('cinder::logging') diff --git a/spec/classes/tripleo_profile_base_glance_api_spec.rb b/spec/classes/tripleo_profile_base_glance_api_spec.rb index 8e8db4499..a16607c39 100644 --- a/spec/classes/tripleo_profile_base_glance_api_spec.rb +++ b/spec/classes/tripleo_profile_base_glance_api_spec.rb @@ -33,6 +33,7 @@ describe 'tripleo::profile::base::glance::api' do is_expected.to_not contain_class('glance') is_expected.to_not contain_class('glance::config') is_expected.to_not contain_class('glance::healthcheck') + is_expected.to_not contain_class('glance::api::db') is_expected.to_not contain_class('glance::api::logging') is_expected.to_not contain_class('glance::api') is_expected.to_not contain_class('glance::key_manager') @@ -63,6 +64,7 @@ describe 'tripleo::profile::base::glance::api' do is_expected.to contain_class('glance') is_expected.to contain_class('glance::config') is_expected.to contain_class('glance::healthcheck') + is_expected.to contain_class('glance::api::db') is_expected.to contain_class('glance::api::logging') is_expected.to contain_class('glance::api') is_expected.to contain_class('glance::key_manager') @@ -88,6 +90,7 @@ describe 'tripleo::profile::base::glance::api' do is_expected.to_not contain_class('glance') is_expected.to_not contain_class('glance::config') is_expected.to_not contain_class('glance::healthcheck') + is_expected.to_not contain_class('glance::api::db') is_expected.to_not contain_class('glance::api::logging') is_expected.to_not contain_class('glance::api') is_expected.to_not contain_class('glance::key_manager') @@ -118,6 +121,7 @@ describe 'tripleo::profile::base::glance::api' do is_expected.to contain_class('glance') is_expected.to contain_class('glance::config') is_expected.to contain_class('glance::healthcheck') + is_expected.to contain_class('glance::api::db') is_expected.to contain_class('glance::api::logging') is_expected.to contain_class('glance::api').with( :enabled_backends => ['default_backend:swift'], diff --git a/spec/classes/tripleo_profile_base_gnocchi_spec.rb b/spec/classes/tripleo_profile_base_gnocchi_spec.rb index 3a7f7ea5e..23c8faa25 100644 --- a/spec/classes/tripleo_profile_base_gnocchi_spec.rb +++ b/spec/classes/tripleo_profile_base_gnocchi_spec.rb @@ -30,9 +30,9 @@ describe 'tripleo::profile::base::gnocchi' do it { is_expected.to_not contain_class('gnocchi') - is_expected.to_not contain_class('gnocchi::db') is_expected.to_not contain_class('gnocchi::config') is_expected.to_not contain_class('gnocchi::cors') + is_expected.to_not contain_class('gnocchi::db') is_expected.to_not contain_class('gnocchi::logging') } end @@ -49,9 +49,9 @@ describe 'tripleo::profile::base::gnocchi' do is_expected.to contain_class('gnocchi').with( :coordination_url => 'redis://:gnocchi@127.0.0.1:6379/' ) - is_expected.to contain_class('gnocchi::db') is_expected.to contain_class('gnocchi::config') is_expected.to contain_class('gnocchi::cors') + is_expected.to contain_class('gnocchi::db') is_expected.to contain_class('gnocchi::logging') } end @@ -64,9 +64,9 @@ describe 'tripleo::profile::base::gnocchi' do it { is_expected.to_not contain_class('gnocchi') - is_expected.to_not contain_class('gnocchi::db') is_expected.to_not contain_class('gnocchi::config') is_expected.to_not contain_class('gnocchi::cors') + is_expected.to_not contain_class('gnocchi::db') is_expected.to_not contain_class('gnocchi::logging') } end @@ -82,9 +82,9 @@ describe 'tripleo::profile::base::gnocchi' do is_expected.to contain_class('gnocchi').with( :coordination_url => 'redis://:gnocchi@127.0.0.1:6379/' ) - is_expected.to contain_class('gnocchi::db') is_expected.to contain_class('gnocchi::config') is_expected.to contain_class('gnocchi::cors') + is_expected.to contain_class('gnocchi::db') is_expected.to contain_class('gnocchi::logging') } end diff --git a/spec/classes/tripleo_profile_base_heat_spec.rb b/spec/classes/tripleo_profile_base_heat_spec.rb index 0c9ce5806..72689bf44 100644 --- a/spec/classes/tripleo_profile_base_heat_spec.rb +++ b/spec/classes/tripleo_profile_base_heat_spec.rb @@ -36,6 +36,7 @@ eos is_expected.to_not contain_class('heat') is_expected.to_not contain_class('heat::config') is_expected.to_not contain_class('heat::cors') + is_expected.to_not contain_class('heat::db') is_expected.to_not contain_class('heat::logging') is_expected.to_not contain_class('heat::cache') is_expected.to_not contain_class('heat::cron::purge_deleted') @@ -70,6 +71,7 @@ eos ) is_expected.to contain_class('heat::config') is_expected.to contain_class('heat::cors') + is_expected.to contain_class('heat::db') is_expected.to contain_class('heat::logging') is_expected.to contain_class('heat::cache').with( :memcache_servers => ['127.0.0.1:11211'] @@ -106,6 +108,7 @@ eos ) is_expected.to contain_class('heat::config') is_expected.to contain_class('heat::cors') + is_expected.to contain_class('heat::db') is_expected.to contain_class('heat::logging') is_expected.to contain_class('heat::cache') is_expected.to contain_class('heat::cache').with( @@ -145,6 +148,7 @@ eos ) is_expected.to contain_class('heat::config') is_expected.to contain_class('heat::cors') + is_expected.to contain_class('heat::db') is_expected.to contain_class('heat::logging') is_expected.to contain_class('heat::cache').with( :memcache_servers => ['[::1]:11211'] diff --git a/spec/classes/tripleo_profile_base_ironic_inspector_spec.rb b/spec/classes/tripleo_profile_base_ironic_inspector_spec.rb index b2636ec39..fb7051194 100644 --- a/spec/classes/tripleo_profile_base_ironic_inspector_spec.rb +++ b/spec/classes/tripleo_profile_base_ironic_inspector_spec.rb @@ -32,6 +32,7 @@ describe 'tripleo::profile::base::ironic_inspector' do it { is_expected.to contain_class('tripleo::profile::base::ironic_inspector') is_expected.to_not contain_class('ironic::inspector') + is_expected.to_not contain_class('ironic::inspector::db') is_expected.to_not contain_class('ironic::inspector::pxe_filter') is_expected.to_not contain_class('ironic::inspector::pxe_filter::dnsmasq') is_expected.to_not contain_class('ironic::config') @@ -51,6 +52,7 @@ describe 'tripleo::profile::base::ironic_inspector' do is_expected.to contain_class('ironic::inspector').with( :dnsmasq_ip_subnets => ['192.168.24.0/24'] ) + is_expected.to contain_class('ironic::inspector::db') is_expected.to contain_class('ironic::inspector::pxe_filter') is_expected.to contain_class('ironic::inspector::pxe_filter::dnsmasq') is_expected.to contain_class('ironic::config') @@ -67,6 +69,7 @@ describe 'tripleo::profile::base::ironic_inspector' do it { is_expected.to contain_class('tripleo::profile::base::ironic_inspector') is_expected.to_not contain_class('ironic::inspector') + is_expected.to_not contain_class('ironic::inspector::db') is_expected.to_not contain_class('ironic::inspector::pxe_filter') is_expected.to_not contain_class('ironic::inspector::pxe_filter::dnsmasq') is_expected.to_not contain_class('ironic::config') @@ -86,6 +89,7 @@ describe 'tripleo::profile::base::ironic_inspector' do is_expected.to contain_class('ironic::inspector').with( :dnsmasq_ip_subnets => ['192.168.24.0/24'] ) + is_expected.to contain_class('ironic::inspector::db') is_expected.to contain_class('ironic::inspector::pxe_filter') is_expected.to contain_class('ironic::inspector::pxe_filter::dnsmasq') is_expected.to contain_class('ironic::config') diff --git a/spec/classes/tripleo_profile_base_ironic_spec.rb b/spec/classes/tripleo_profile_base_ironic_spec.rb index 5ddf3bcef..55417cbee 100644 --- a/spec/classes/tripleo_profile_base_ironic_spec.rb +++ b/spec/classes/tripleo_profile_base_ironic_spec.rb @@ -32,6 +32,7 @@ describe 'tripleo::profile::base::ironic' do is_expected.to_not contain_class('ironic') is_expected.to_not contain_class('ironic::config') is_expected.to_not contain_class('ironic::cors') + is_expected.to_not contain_class('ironic::db') is_expected.to_not contain_class('ironic::logging') } end @@ -52,6 +53,7 @@ describe 'tripleo::profile::base::ironic' do ) is_expected.to contain_class('ironic::config') is_expected.to contain_class('ironic::cors') + is_expected.to contain_class('ironic::db') is_expected.to contain_class('ironic::logging') } end @@ -69,6 +71,7 @@ describe 'tripleo::profile::base::ironic' do is_expected.to_not contain_class('ironic') is_expected.to_not contain_class('ironic::config') is_expected.to_not contain_class('ironic::cors') + is_expected.to_not contain_class('ironic::db') is_expected.to_not contain_class('ironic::logging') } end @@ -88,6 +91,7 @@ describe 'tripleo::profile::base::ironic' do ) is_expected.to contain_class('ironic::config') is_expected.to contain_class('ironic::cors') + is_expected.to contain_class('ironic::db') is_expected.to contain_class('ironic::logging') } end diff --git a/spec/classes/tripleo_profile_base_keystone_spec.rb b/spec/classes/tripleo_profile_base_keystone_spec.rb index e0e21e674..2233031da 100644 --- a/spec/classes/tripleo_profile_base_keystone_spec.rb +++ b/spec/classes/tripleo_profile_base_keystone_spec.rb @@ -45,6 +45,7 @@ describe 'tripleo::profile::base::keystone' do is_expected.to_not contain_class('keystone') is_expected.to_not contain_class('keystone::healthcheck') is_expected.to_not contain_class('keystone::config') + is_expected.to_not contain_class('keystone::db') is_expected.to_not contain_class('keystone::logging') is_expected.to_not contain_class('tripleo::profile::base::apache') is_expected.to_not contain_class('keystone::wsgi::apache') @@ -71,6 +72,7 @@ describe 'tripleo::profile::base::keystone' do ) is_expected.to contain_class('keystone::healthcheck') is_expected.to contain_class('keystone::config') + is_expected.to contain_class('keystone::db') is_expected.to contain_class('keystone::logging') is_expected.to contain_class('tripleo::profile::base::apache') is_expected.to contain_class('keystone::wsgi::apache') @@ -96,6 +98,7 @@ describe 'tripleo::profile::base::keystone' do is_expected.to_not contain_class('keystone') is_expected.to_not contain_class('keystone::healthcheck') is_expected.to_not contain_class('keystone::config') + is_expected.to_not contain_class('keystone::db') is_expected.to_not contain_class('keystone::logging') is_expected.to_not contain_class('tripleo::profile::base::apache') is_expected.to_not contain_class('keystone::wsgi::apache') @@ -122,6 +125,7 @@ describe 'tripleo::profile::base::keystone' do ) is_expected.to contain_class('keystone::healthcheck') is_expected.to contain_class('keystone::config') + is_expected.to contain_class('keystone::db') is_expected.to contain_class('keystone::logging') is_expected.to contain_class('tripleo::profile::base::apache') is_expected.to contain_class('keystone::wsgi::apache') @@ -152,6 +156,7 @@ describe 'tripleo::profile::base::keystone' do ) is_expected.to contain_class('keystone::healthcheck') is_expected.to contain_class('keystone::config') + is_expected.to contain_class('keystone::db') is_expected.to contain_class('keystone::logging') is_expected.to contain_class('tripleo::profile::base::apache') is_expected.to contain_class('keystone::wsgi::apache') diff --git a/spec/classes/tripleo_profile_base_mistral_spec.rb b/spec/classes/tripleo_profile_base_mistral_spec.rb index 436c2f9de..8385d46ec 100644 --- a/spec/classes/tripleo_profile_base_mistral_spec.rb +++ b/spec/classes/tripleo_profile_base_mistral_spec.rb @@ -24,9 +24,10 @@ describe 'tripleo::profile::base::mistral' do is_expected.to contain_class('tripleo::profile::base::mistral') is_expected.to_not contain_class('mistral') is_expected.to_not contain_class('mistral::config') - is_expected.to_not contain_class('mistral::logging') - is_expected.to_not contain_class('mistral::db::sync') is_expected.to_not contain_class('mistral::cors') + is_expected.to_not contain_class('mistral::db') + is_expected.to_not contain_class('mistral::db::sync') + is_expected.to_not contain_class('mistral::logging') end end @@ -45,14 +46,16 @@ describe 'tripleo::profile::base::mistral' do } } it 'should trigger complete configuration' do + is_expected.to contain_class('tripleo::profile::base::mistral') is_expected.to contain_class('mistral').with( :default_transport_url => 'rabbit://mistral1:foo@192.168.0.1:1234/?ssl=0', :notification_transport_url => 'rabbit://mistral2:baa@192.168.0.2:5678/?ssl=0' ) is_expected.to contain_class('mistral::config') - is_expected.to contain_class('mistral::logging') - is_expected.to contain_class('mistral::db::sync') is_expected.to contain_class('mistral::cors') + is_expected.to contain_class('mistral::db') + is_expected.to contain_class('mistral::db::sync') + is_expected.to contain_class('mistral::logging') end end @@ -66,9 +69,10 @@ describe 'tripleo::profile::base::mistral' do is_expected.to contain_class('tripleo::profile::base::mistral') is_expected.to_not contain_class('mistral') is_expected.to_not contain_class('mistral::config') - is_expected.to_not contain_class('mistral::logging') - is_expected.to_not contain_class('mistral::db::sync') is_expected.to_not contain_class('mistral::cors') + is_expected.to_not contain_class('mistral::db') + is_expected.to_not contain_class('mistral::db::sync') + is_expected.to_not contain_class('mistral::logging') end end @@ -87,14 +91,16 @@ describe 'tripleo::profile::base::mistral' do } } it 'should trigger complete configuration' do + is_expected.to contain_class('tripleo::profile::base::mistral') is_expected.to contain_class('mistral').with( :default_transport_url => 'rabbit://mistral1:foo@192.168.0.1:1234/?ssl=0', :notification_transport_url => 'rabbit://mistral2:baa@192.168.0.2:5678/?ssl=0' ) is_expected.to contain_class('mistral::config') - is_expected.to contain_class('mistral::logging') - is_expected.to contain_class('mistral::db::sync') is_expected.to contain_class('mistral::cors') + is_expected.to contain_class('mistral::db') + is_expected.to contain_class('mistral::db::sync') + is_expected.to contain_class('mistral::logging') end end diff --git a/spec/classes/tripleo_profile_base_octavia_spec.rb b/spec/classes/tripleo_profile_base_octavia_spec.rb index 00706212c..a6aa90264 100644 --- a/spec/classes/tripleo_profile_base_octavia_spec.rb +++ b/spec/classes/tripleo_profile_base_octavia_spec.rb @@ -34,6 +34,7 @@ describe 'tripleo::profile::base::octavia' do it 'should not do anything' do is_expected.to_not contain_class('octavia') is_expected.to_not contain_class('octavia::config') + is_expected.to_not contain_class('octavia::db') end end @@ -47,6 +48,7 @@ describe 'tripleo::profile::base::octavia' do :default_transport_url => 'rabbit://guest:password@some.server.com:5672/?ssl=0' ) is_expected.to contain_class('octavia::config') + is_expected.to contain_class('octavia::db') end end diff --git a/spec/classes/tripleo_profile_base_placement_spec.rb b/spec/classes/tripleo_profile_base_placement_spec.rb index 040894498..e12e5486b 100644 --- a/spec/classes/tripleo_profile_base_placement_spec.rb +++ b/spec/classes/tripleo_profile_base_placement_spec.rb @@ -28,8 +28,8 @@ describe 'tripleo::profile::base::placement' do is_expected.to contain_class('tripleo::profile::base::placement') is_expected.to_not contain_class('placement') is_expected.to_not contain_class('placement::config') - is_expected.to_not contain_class('placement::logging') is_expected.to_not contain_class('placement::db') + is_expected.to_not contain_class('placement::logging') } end @@ -43,8 +43,8 @@ describe 'tripleo::profile::base::placement' do is_expected.to contain_class('tripleo::profile::base::placement') is_expected.to contain_class('placement') is_expected.to contain_class('placement::config') - is_expected.to contain_class('placement::logging') is_expected.to contain_class('placement::db') + is_expected.to contain_class('placement::logging') } end @@ -58,8 +58,8 @@ describe 'tripleo::profile::base::placement' do is_expected.to contain_class('tripleo::profile::base::placement') is_expected.to_not contain_class('placement') is_expected.to_not contain_class('placement::config') - is_expected.to_not contain_class('placement::logging') is_expected.to_not contain_class('placement::db') + is_expected.to_not contain_class('placement::logging') } end @@ -73,8 +73,8 @@ describe 'tripleo::profile::base::placement' do is_expected.to contain_class('tripleo::profile::base::placement') is_expected.to contain_class('placement') is_expected.to contain_class('placement::config') - is_expected.to contain_class('placement::logging') is_expected.to contain_class('placement::db') + is_expected.to contain_class('placement::logging') } end