Merge "cinder: move glance params into common"

4 files changed, 7 insertions, 5 deletions

diff --git a/manifests/profile/base/cinder.pp b/manifests/profile/base/cinder.pp
index 6a821f3..6e8fbb2 100644
--- a/manifests/profile/base/cinder.pp
+++ b/manifests/profile/base/cinder.pp
@@ -57,6 +57,7 @@ class tripleo::profile::base::cinder (
       rabbit_hosts => $rabbit_endpoints,
     }
     include ::cinder::config
+    include ::cinder::glance
   }
 
   if $step >= 5 {
diff --git a/manifests/profile/base/cinder/api.pp b/manifests/profile/base/cinder/api.pp
index 5ea2058..450a8e6 100644
--- a/manifests/profile/base/cinder/api.pp
+++ b/manifests/profile/base/cinder/api.pp
@@ -94,7 +94,6 @@ class tripleo::profile::base::cinder::api (
       ssl_key  => $tls_keyfile,
     }
     include ::cinder::ceilometer
-    include ::cinder::glance
   }
 
 }
diff --git a/spec/classes/tripleo_profile_base_cinder_api_spec.rb b/spec/classes/tripleo_profile_base_cinder_api_spec.rb
index a0c607d..6a36632 100644
--- a/spec/classes/tripleo_profile_base_cinder_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_cinder_api_spec.rb
@@ -30,7 +30,6 @@ describe 'tripleo::profile::base::cinder::api' do
         is_expected.to contain_class('tripleo::profile::base::cinder')
         is_expected.to_not contain_class('cinder::api')
         is_expected.to_not contain_class('cinder::ceilometer')
-        is_expected.to_not contain_class('cinder::glance')
       end
     end
 
@@ -43,7 +42,6 @@ describe 'tripleo::profile::base::cinder::api' do
       it 'should trigger complete configuration' do
         is_expected.to contain_class('cinder::api')
         is_expected.to contain_class('cinder::ceilometer')
-        is_expected.to contain_class('cinder::glance')
       end
     end
 
@@ -56,7 +54,6 @@ describe 'tripleo::profile::base::cinder::api' do
       it 'should not trigger any configuration' do
         is_expected.to_not contain_class('cinder::api')
         is_expected.to_not contain_class('cinder::ceilometer')
-        is_expected.to_not contain_class('cinder::glance')
       end
     end
 
@@ -68,7 +65,6 @@ describe 'tripleo::profile::base::cinder::api' do
       it 'should trigger complete configuration' do
         is_expected.to contain_class('cinder::api')
         is_expected.to contain_class('cinder::ceilometer')
-        is_expected.to contain_class('cinder::glance')
       end
     end
   end
diff --git a/spec/classes/tripleo_profile_base_cinder_spec.rb b/spec/classes/tripleo_profile_base_cinder_spec.rb
index 6a36152..81fa047 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::glance')
         is_expected.to_not contain_class('cinder:::cron::db_purge')
       end
     end
@@ -41,6 +42,7 @@ describe 'tripleo::profile::base::cinder' do
           :rabbit_hosts => params[:rabbit_hosts].map{ |h| "#{h}:#{params[:rabbit_port]}" }
         )
         is_expected.to contain_class('cinder::config')
+        is_expected.to contain_class('cinder::glance')
         is_expected.to_not contain_class('cinder::cron::db_purge')
       end
     end
@@ -54,6 +56,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::glance')
         is_expected.to_not contain_class('cinder:::cron::db_purge')
       end
     end
@@ -71,6 +74,7 @@ describe 'tripleo::profile::base::cinder' do
           :rabbit_hosts => params[:rabbit_hosts].map{ |h| "#{h}:#{params[:rabbit_port]}" }
         )
         is_expected.to contain_class('cinder::config')
+        is_expected.to contain_class('cinder::glance')
         is_expected.to_not contain_class('cinder:::cron::db_purge')
       end
     end
@@ -87,6 +91,7 @@ describe 'tripleo::profile::base::cinder' do
           :rabbit_hosts => params[:rabbit_hosts].map{ |h| "#{h}:5672" }
         )
         is_expected.to contain_class('cinder::config')
+        is_expected.to contain_class('cinder::glance')
         is_expected.to contain_class('cinder::cron::db_purge')
       end
     end
@@ -104,6 +109,7 @@ describe 'tripleo::profile::base::cinder' do
           :rabbit_hosts => params[:rabbit_hosts].map{ |h| "#{h}:5672" }
         )
         is_expected.to contain_class('cinder::config')
+        is_expected.to contain_class('cinder::glance')
         is_expected.to_not contain_class('cinder::cron::db_purge')
       end
     end