Always start httpd at the same time (TLS proxy)

For the TLS everywhere job, there are some apache vhosts set up that
serve as TLS proxies. These need to be started at the same time as the
rest of the apache vhosts too.

Change-Id: I15e67c7c04142cff01704e2590d3b2a6a949cc06

2 files changed, 21 insertions, 7 deletions

diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp
index 0dee53e..60ef443 100644
--- a/manifests/profile/base/neutron/server.pp
+++ b/manifests/profile/base/neutron/server.pp
@@ -113,10 +113,7 @@ class tripleo::profile::base::neutron::server (
     $l3_ha = false
   }
 
-  # We start neutron-server on the bootstrap node first, because
-  # it will try to populate tables and we need to make sure this happens
-  # before it starts on other nodes
-  if $step >= 4 and $sync_db or $step >= 5 and !$sync_db {
+  if $step >= 4 or ($step >= 3 and $sync_db) {
     if $enable_internal_tls {
       if !$neutron_network {
         fail('neutron_api_network is not set in the hieradata.')
@@ -130,9 +127,14 @@ class tripleo::profile::base::neutron::server (
         port       => $tls_proxy_port,
         tls_cert   => $tls_certfile,
         tls_key    => $tls_keyfile,
-        notify     => Class['::neutron::server'],
       }
+      Tripleo::Tls_proxy['neutron-api'] ~> Anchor<| title == 'neutron::service::begin' |>
     }
+  }
+  # We start neutron-server on the bootstrap node first, because
+  # it will try to populate tables and we need to make sure this happens
+  # before it starts on other nodes
+  if $step >= 4 and $sync_db or $step >= 5 and !$sync_db {
 
     include ::neutron::server::notifications
     # We need to override the hiera value neutron::server::sync_db which is set
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp
index b047c36..afb5fa6 100644
--- a/manifests/profile/base/swift/proxy.pp
+++ b/manifests/profile/base/swift/proxy.pp
@@ -18,6 +18,10 @@
 #
 # === Parameters
 #
+# [*bootstrap_node*]
+#   (Optional) The hostname of the node responsible for bootstrapping tasks
+#   Defaults to hiera('bootstrap_nodeid')
+#
 # [*ceilometer_enabled*]
 #   Whether the ceilometer pipeline is enabled.
 #   Defaults to true
@@ -96,6 +100,7 @@
 #   defaults to 8080
 #
 class tripleo::profile::base::swift::proxy (
+  $bootstrap_node                = hiera('bootstrap_nodeid', undef),
   $ceilometer_enabled            = true,
   $ceilometer_messaging_driver   = hiera('messaging_notify_service_name', 'rabbit'),
   $ceilometer_messaging_hosts    = any2array(hiera('rabbitmq_node_names', undef)),
@@ -113,7 +118,12 @@ class tripleo::profile::base::swift::proxy (
   $tls_proxy_fqdn                = undef,
   $tls_proxy_port                = 8080,
 ) {
-  if $step >= 4 {
+  if $::hostname == downcase($bootstrap_node) {
+    $is_bootstrap = true
+  } else {
+    $is_bootstrap = false
+  }
+  if $step >= 4 or ($step >= 3 and $is_bootstrap) {
     if $enable_internal_tls {
       if !$swift_proxy_network {
         fail('swift_proxy_network is not set in the hieradata.')
@@ -127,9 +137,11 @@ class tripleo::profile::base::swift::proxy (
         port       => $tls_proxy_port,
         tls_cert   => $tls_certfile,
         tls_key    => $tls_keyfile,
-        notify     => Class['::swift::proxy'],
       }
+      Tripleo::Tls_proxy['swift-proxy-api'] ~> Anchor<| title == 'swift::service::begin' |>
     }
+  }
+  if $step >= 4 {
     $swift_memcache_servers = suffix(any2array(normalize_ip_for_uri($memcache_servers)), ":${memcache_port}")
     include ::swift::config
     include ::swift::proxy