From 3a5294ea9aa61d713632e031266dc9383c6bc8ec Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobreli@redhat.com>
Date: Thu, 1 Aug 2019 17:10:04 +0200
Subject: [PATCH] Add missing base apache configs when internal TLS

Some services are missing the base apache configuration, when
running with TLS and under WSGI. Address that in its base
profiles.

Related-Bug: #1835414

Change-Id: I8148a039ab9dcbc97baff141aae6ebab4c27e16d
Signed-off-by: Bogdan Dobrelya <bdobreli@redhat.com>
---
 manifests/profile/base/glance/api.pp     | 1 +
 manifests/profile/base/neutron/server.pp | 1 +
 manifests/profile/base/nova/ec2api.pp    | 1 +
 manifests/profile/base/swift/proxy.pp    | 1 +
 4 files changed, 4 insertions(+)

diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp
index 9cb546e16..0f4272560 100644
--- a/manifests/profile/base/glance/api.pp
+++ b/manifests/profile/base/glance/api.pp
@@ -170,6 +170,7 @@ class tripleo::profile::base::glance::api (
         tls_key    => $tls_keyfile,
         notify     => Class['::glance::api'],
       }
+      include ::tripleo::profile::base::apache
     }
     case $glance_backend {
         'swift': { $backend_store = 'swift' }
diff --git a/manifests/profile/base/neutron/server.pp b/manifests/profile/base/neutron/server.pp
index e772c1f78..66e9e2650 100644
--- a/manifests/profile/base/neutron/server.pp
+++ b/manifests/profile/base/neutron/server.pp
@@ -138,6 +138,7 @@ class tripleo::profile::base::neutron::server (
     if $designate_api_enabled {
       include ::neutron::designate
     }
+    include ::tripleo::profile::base::apache
   }
   # We start neutron-server on the bootstrap node first, because
   # it will try to populate tables and we need to make sure this happens
diff --git a/manifests/profile/base/nova/ec2api.pp b/manifests/profile/base/nova/ec2api.pp
index 652743b4f..ca383fcaf 100644
--- a/manifests/profile/base/nova/ec2api.pp
+++ b/manifests/profile/base/nova/ec2api.pp
@@ -135,6 +135,7 @@ class tripleo::profile::base::nova::ec2api (
         tls_key    => $metadata_tls_keyfile,
       }
       Tripleo::Tls_proxy['ec2-api-metadata'] ~> Anchor<| title == 'ec2api::service::begin' |>
+      include ::tripleo::profile::base::apache
     }
     include ::ec2api
     include ::ec2api::api
diff --git a/manifests/profile/base/swift/proxy.pp b/manifests/profile/base/swift/proxy.pp
index 6f27fb2e9..c07a0ce26 100644
--- a/manifests/profile/base/swift/proxy.pp
+++ b/manifests/profile/base/swift/proxy.pp
@@ -139,6 +139,7 @@ class tripleo::profile::base::swift::proxy (
         tls_key    => $tls_keyfile,
       }
       Tripleo::Tls_proxy['swift-proxy-api'] ~> Anchor<| title == 'swift::service::begin' |>
+      include ::tripleo::profile::base::apache
     }
   }
   if $step >= 4 {