From 6691c97e360abe815073fc65499b0a0eb8ccdb3c Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 21 Apr 2021 22:33:24 +0900 Subject: [PATCH] nova: include nova::cinder in more common place ... because the cinder_catalog_info parameter, which is used by api and compute, have been migrated from nova to nova::cinder[1]. [1] 72103db985d00b3289b8b936956166f20ef8f3d0 Change-Id: Ic90e3eb0898d9c8317fb994db4275be2db0bc679 --- manifests/profile/base/nova.pp | 1 + manifests/profile/base/nova/compute.pp | 1 - spec/classes/tripleo_profile_base_nova_compute_spec.rb | 4 ---- spec/classes/tripleo_profile_base_nova_spec.rb | 4 ++++ 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/manifests/profile/base/nova.pp b/manifests/profile/base/nova.pp index 214aa02c6..c4bd4e883 100644 --- a/manifests/profile/base/nova.pp +++ b/manifests/profile/base/nova.pp @@ -144,6 +144,7 @@ class tripleo::profile::base::nova ( 'ssl' => $oslomsg_notify_use_ssl_real, }), } + include nova::cinder include nova::glance include nova::placement include nova::keystone::service_user diff --git a/manifests/profile/base/nova/compute.pp b/manifests/profile/base/nova/compute.pp index 373c66827..828574148 100644 --- a/manifests/profile/base/nova/compute.pp +++ b/manifests/profile/base/nova/compute.pp @@ -50,7 +50,6 @@ class tripleo::profile::base::nova::compute ( if $step >= 4 { # deploy basic bits for nova include tripleo::profile::base::nova - include nova::cinder include nova::compute::image_cache include nova::vendordata include nova::compute::provider diff --git a/spec/classes/tripleo_profile_base_nova_compute_spec.rb b/spec/classes/tripleo_profile_base_nova_compute_spec.rb index 773b3b999..2eb58d3ff 100644 --- a/spec/classes/tripleo_profile_base_nova_compute_spec.rb +++ b/spec/classes/tripleo_profile_base_nova_compute_spec.rb @@ -28,7 +28,6 @@ describe 'tripleo::profile::base::nova::compute' do it { is_expected.to contain_class('tripleo::profile::base::nova::compute') is_expected.to_not contain_class('tripleo::profile::base::nova') - is_expected.to_not contain_class('nova::cinder') is_expected.to_not contain_class('nova::compute::image_cache') is_expected.to_not contain_class('nova::vendordata') is_expected.to_not contain_class('nova::compute') @@ -58,7 +57,6 @@ eos it { is_expected.to contain_class('tripleo::profile::base::nova::compute') is_expected.to contain_class('tripleo::profile::base::nova') - is_expected.to contain_class('nova::cinder') is_expected.to contain_class('nova::compute::image_cache') is_expected.to contain_class('nova::vendordata') is_expected.to contain_class('nova::compute') @@ -86,7 +84,6 @@ eos it { is_expected.to contain_class('tripleo::profile::base::nova::compute') is_expected.to contain_class('tripleo::profile::base::nova') - is_expected.to contain_class('nova::cinder') is_expected.to contain_class('nova::compute::image_cache') is_expected.to contain_class('nova::vendordata') is_expected.to contain_class('nova::compute') @@ -101,7 +98,6 @@ eos it { is_expected.to contain_class('tripleo::profile::base::nova::compute') is_expected.to contain_class('tripleo::profile::base::nova') - is_expected.to contain_class('nova::cinder') is_expected.to contain_class('nova::compute::image_cache') is_expected.to contain_class('nova::vendordata') is_expected.to contain_class('nova::compute') diff --git a/spec/classes/tripleo_profile_base_nova_spec.rb b/spec/classes/tripleo_profile_base_nova_spec.rb index c45aea773..11a953fc2 100644 --- a/spec/classes/tripleo_profile_base_nova_spec.rb +++ b/spec/classes/tripleo_profile_base_nova_spec.rb @@ -32,6 +32,7 @@ describe 'tripleo::profile::base::nova' do is_expected.to_not contain_class('nova::config') is_expected.to_not contain_class('nova::logging') is_expected.to_not contain_class('nova::cache') + is_expected.to_not contain_class('nova::cinder') is_expected.to_not contain_class('nova::glance') is_expected.to_not contain_class('nova::placement') is_expected.to_not contain_class('nova::keystone::service_user') @@ -57,6 +58,7 @@ describe 'tripleo::profile::base::nova' do is_expected.to contain_class('nova::cache').with( :memcache_servers => ['127.0.0.1:11211'] ) + is_expected.to contain_class('nova::cinder') is_expected.to contain_class('nova::glance') is_expected.to contain_class('nova::placement') is_expected.to contain_class('nova::keystone::service_user') @@ -77,6 +79,7 @@ describe 'tripleo::profile::base::nova' do is_expected.to_not contain_class('nova::config') is_expected.to_not contain_class('nova::logging') is_expected.to_not contain_class('nova::cache') + is_expected.to_not contain_class('nova::cinder') is_expected.to_not contain_class('nova::glance') is_expected.to_not contain_class('nova::placement') is_expected.to_not contain_class('nova::keystone::service_user') @@ -102,6 +105,7 @@ describe 'tripleo::profile::base::nova' do is_expected.to contain_class('nova::config') is_expected.to contain_class('nova::logging') is_expected.to contain_class('nova::cache') + is_expected.to contain_class('nova::cinder') is_expected.to contain_class('nova::glance') is_expected.to contain_class('nova::placement') is_expected.to contain_class('nova::keystone::service_user')