Merge "nova/api: more cleanup"

1 files changed, 29 insertions, 11 deletions

diff --git a/spec/classes/tripleo_profile_base_nova_api_spec.rb b/spec/classes/tripleo_profile_base_nova_api_spec.rb
index def4f4e..2072438 100644
--- a/spec/classes/tripleo_profile_base_nova_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_api_spec.rb
@@ -39,7 +39,7 @@ eos
         is_expected.to contain_class('tripleo::profile::base::nova')
         is_expected.to_not contain_class('nova::keystone::authtoken')
         is_expected.to_not contain_class('nova::api')
-        #is_expected.to_not contain_class('nova::wsgi::apache_api')
+        is_expected.to_not contain_class('nova::wsgi::apache_api')
         is_expected.to_not contain_class('nova::network::neutron')
       }
     end
@@ -56,25 +56,25 @@ eos
         is_expected.to contain_class('nova::cell_v2::simple_setup')
         is_expected.to contain_class('nova::keystone::authtoken')
         is_expected.to contain_class('nova::api')
-        #is_expected.to contain_class('nova::wsgi::apache_api')
+        is_expected.to_not contain_class('nova::wsgi::apache_api')
         is_expected.to contain_class('nova::network::neutron')
       }
     end
 
-    context 'with step 3 not on bootstrap node' do
+    context 'with step 3 on bootstrap node' do
       let(:params) { {
-        :step           => 3,
-        :bootstrap_node => 'other.example.com',
+        :step => 3,
+        :bootstrap_node => 'node.example.com',
       } }
 
       it {
         is_expected.to contain_class('tripleo::profile::base::nova::api')
         is_expected.to contain_class('tripleo::profile::base::nova')
-        is_expected.to_not contain_class('nova::db::sync_cell_v2')
-        is_expected.to_not contain_class('nova::keystone::authtoken')
-        is_expected.to_not contain_class('nova::api')
-        #is_expected.to_not contain_class('nova::wsgi::apache_api')
-        is_expected.to_not contain_class('nova::network::neutron')
+        is_expected.to contain_class('nova::cell_v2::simple_setup')
+        is_expected.to contain_class('nova::keystone::authtoken')
+        is_expected.to contain_class('nova::api')
+        is_expected.to_not contain_class('nova::wsgi::apache_api')
+        is_expected.to contain_class('nova::network::neutron')
       }
     end
 
@@ -88,7 +88,25 @@ eos
         is_expected.to_not contain_class('nova::db::sync_cell_v2')
         is_expected.to contain_class('nova::keystone::authtoken')
         is_expected.to contain_class('nova::api')
-        #is_expected.to contain_class('nova::wsgi::apache_api')
+        is_expected.to_not contain_class('nova::wsgi::apache_api')
+        is_expected.to contain_class('nova::network::neutron')
+      }
+    end
+
+    context 'with step 4 not on bootstrap node' do
+      let(:params) { {
+        :step                  => 4,
+        :bootstrap_node        => 'other.example.com',
+        :nova_api_wsgi_enabled => true,
+      } }
+
+      it {
+        is_expected.to contain_class('tripleo::profile::base::nova::api')
+        is_expected.to contain_class('tripleo::profile::base::nova')
+        is_expected.to_not contain_class('nova::db::sync_cell_v2')
+        is_expected.to contain_class('nova::keystone::authtoken')
+        is_expected.to contain_class('nova::api')
+        is_expected.to contain_class('nova::wsgi::apache_api')
         is_expected.to contain_class('nova::network::neutron')
       }
     end