Always start httpd at the same time

Puppet wipes out whatever is not in it's resource catalog each run for
httpd. This causes httpd to restart if in the next step there are
reasources added that were not there earlier.

This patch, thus changes the instances of httpd to start at the same
time: On step 3 for the bootstrap node, and on step 4 for every other
node.

Closes-Bug: #1699502
Change-Id: I3d29728c1ab7bd5b78100f89e00e5fa082f97b0c
Co-Authored-By: Alex Schultz <aschultz@redhat.com>

4 files changed, 93 insertions, 7 deletions

diff --git a/spec/classes/tripleo_profile_base_aodh_api_spec.rb b/spec/classes/tripleo_profile_base_aodh_api_spec.rb
index a82cf49..27bd735 100644
--- a/spec/classes/tripleo_profile_base_aodh_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_aodh_api_spec.rb
@@ -33,12 +33,35 @@ describe 'tripleo::profile::base::aodh::api' do
       end
     end
 
-    context 'with step 3' do
+    context 'with step 3 and not bootstrap' do
       let(:params) { {
         :step => 3,
       } }
 
       it 'should trigger complete configuration' do
+        is_expected.not_to contain_class('aodh::api')
+        is_expected.not_to contain_class('aodh::wsgi::apache')
+      end
+    end
+
+    context 'with step 3 and bootstrap' do
+      let(:params) { {
+        :step           => 3,
+        :bootstrap_node => 'node.example.com'
+      } }
+
+      it 'should trigger complete configuration' do
+        is_expected.to contain_class('aodh::api')
+        is_expected.to contain_class('aodh::wsgi::apache')
+      end
+    end
+
+    context 'with step 4' do
+      let(:params) { {
+        :step => 4,
+      } }
+
+      it 'should trigger complete configuration' do
         is_expected.to contain_class('aodh::api')
         is_expected.to contain_class('aodh::wsgi::apache')
       end
diff --git a/spec/classes/tripleo_profile_base_ceilometer_api_spec.rb b/spec/classes/tripleo_profile_base_ceilometer_api_spec.rb
index cec2b54..9cb657f 100644
--- a/spec/classes/tripleo_profile_base_ceilometer_api_spec.rb
+++ b/spec/classes/tripleo_profile_base_ceilometer_api_spec.rb
@@ -32,9 +32,32 @@ describe 'tripleo::profile::base::ceilometer::api' do
       end
     end
 
-    context 'with step 3' do
+    context 'with step 3 and not bootstrap' do
       let(:params) { {
-        :step            => 3,
+        :step => 3,
+      } }
+
+      it 'should trigger complete configuration' do
+        is_expected.not_to contain_class('ceilometer::api')
+        is_expected.not_to contain_class('ceilometer::wsgi::apache')
+      end
+    end
+
+    context 'with step 3 and bootstrap' do
+      let(:params) { {
+        :step           => 3,
+        :bootstrap_node => 'node.example.com'
+      } }
+
+      it 'should trigger complete configuration' do
+        is_expected.to contain_class('ceilometer::api')
+        is_expected.to contain_class('ceilometer::wsgi::apache')
+      end
+    end
+
+    context 'with step 4' do
+      let(:params) { {
+        :step => 4,
       } }
 
       it 'should trigger complete configuration' do
diff --git a/spec/classes/tripleo_profile_base_horizon_spec.rb b/spec/classes/tripleo_profile_base_horizon_spec.rb
index fb076b8..d8a672b 100644
--- a/spec/classes/tripleo_profile_base_horizon_spec.rb
+++ b/spec/classes/tripleo_profile_base_horizon_spec.rb
@@ -31,11 +31,37 @@ describe 'tripleo::profile::base::horizon' do
       end
     end
 
-    context 'with step 3' do
+    context 'with step 3 and not bootstrap' do
       let(:params) { {
         :step => 3,
       } }
 
+      it 'should not configure anything' do
+        is_expected.to_not contain_class('horizon')
+        is_expected.to_not contain_class('apache::mod::remoteip')
+        is_expected.to_not contain_class('apache::mod::status')
+      end
+    end
+
+    context 'with step 3 and bootstrap' do
+      let(:params) { {
+        :step           => 3,
+        :bootstrap_node => 'node.example.com'
+      } }
+
+      it 'should trigger complete configuration' do
+        is_expected.to contain_class('horizon')
+        is_expected.to contain_class('apache::mod::remoteip')
+        is_expected.to contain_class('apache::mod::status')
+      end
+    end
+
+    context 'with step 4' do
+      let(:params) { {
+        :step           => 3,
+        :bootstrap_node => 'node.example.com'
+      } }
+
       it 'should trigger complete configuration' do
         is_expected.to contain_class('horizon')
         is_expected.to contain_class('apache::mod::remoteip')
diff --git a/spec/classes/tripleo_profile_base_nova_placement_spec.rb b/spec/classes/tripleo_profile_base_nova_placement_spec.rb
index 04e032a..574489e 100644
--- a/spec/classes/tripleo_profile_base_nova_placement_spec.rb
+++ b/spec/classes/tripleo_profile_base_nova_placement_spec.rb
@@ -67,8 +67,7 @@ eos
       }
     end
 
-
-    context 'with step 3' do
+    context 'with step 3 and not bootstrap' do
       let(:params) { {
         :step => 3,
       } }
@@ -77,15 +76,30 @@ eos
         is_expected.to contain_class('tripleo::profile::base::nova::placement')
         is_expected.to contain_class('tripleo::profile::base::nova')
         is_expected.to contain_class('nova::keystone::authtoken')
+        is_expected.not_to contain_class('nova::wsgi::apache_placement')
+      }
+    end
+
+    context 'with step 3 and bootstrap' do
+      let(:params) { {
+        :step           => 3,
+        :bootstrap_node => 'node.example.com'
+      } }
+
+      it {
+        is_expected.to contain_class('tripleo::profile::base::nova::placement')
+        is_expected.to contain_class('tripleo::profile::base::nova')
+        is_expected.to contain_class('nova::keystone::authtoken')
         is_expected.to contain_class('nova::wsgi::apache_placement')
       }
     end
 
-    context 'with step 3 with enable_internal_tls and skip generate certs' do
+    context 'with step 3 and bootstrap with enable_internal_tls and skip generate certs' do
       let(:params) { {
         :step => 3,
         :enable_internal_tls           => true,
         :nova_placement_network        => 'bar',
+        :bootstrap_node                => 'node.example.com',
         :certificates_specs            => {
             'httpd-bar' => {
                  'hostname'           => 'foo',