From 87652700db4532030360ad251e2a75484708bb26 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 3 Feb 2017 15:53:20 -0500 Subject: nova/api: more cleanup - transform nova_api_wsgi_enabled in a parameter - update rspec tests - fix TLS to run at step 1 Change-Id: I4d3f9c92f0717ae8c3bc8d71065fab281de82008 --- spec/classes/tripleo_profile_base_nova_api_spec.rb | 40 ++++++++++++++++------ 1 file changed, 29 insertions(+), 11 deletions(-) (limited to 'spec') 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 -- cgit 1.2.3-korg