aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile/base/heat
diff options
context:
space:
mode:
authorCédric Jeanneret <cedric.jeanneret@camptocamp.com>2017-10-19 08:32:09 +0200
committerCédric Jeanneret <cedric.jeanneret@camptocamp.com>2017-11-13 12:03:28 +0000
commit8eafd014a8c01826d50c12444271973aace8961b (patch)
treec9a7182b76a06f1ca485487bd3e53c933f12f83c /manifests/profile/base/heat
parentf2b1ec7ee9c70563ed682c314910c8fd4c6871aa (diff)
Create dedicated "apache" base profile
This profile has multiple purposes: - group common httpd configurations/instructions - correct a small issue with the "status" mod Until now, only Horizon was specifically including this mode, and as httpd wasn't listening on localhost, it wasn't in use at all. With this commit, all API using apache will be able to provide the httpd server status on 127.0.0.1/server-status. Change-Id: If6d64f807c244d7e56852a67ac7dbad26c4c002f Closes-Bug: 1724751 (cherry picked from commit 0933bc5fd896ac2474872bb1b4b217ad8f430885)
Diffstat (limited to 'manifests/profile/base/heat')
-rw-r--r--manifests/profile/base/heat/api.pp2
-rw-r--r--manifests/profile/base/heat/api_cfn.pp2
-rw-r--r--manifests/profile/base/heat/api_cloudwatch.pp2
3 files changed, 3 insertions, 3 deletions
diff --git a/manifests/profile/base/heat/api.pp b/manifests/profile/base/heat/api.pp
index 2221b37..46435bf 100644
--- a/manifests/profile/base/heat/api.pp
+++ b/manifests/profile/base/heat/api.pp
@@ -76,7 +76,7 @@ class tripleo::profile::base::heat::api (
if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
include ::heat::api
- include ::apache::mod::ssl
+ include ::tripleo::profile::base::apache
class { '::heat::wsgi::apache_api':
ssl_cert => $tls_certfile,
ssl_key => $tls_keyfile,
diff --git a/manifests/profile/base/heat/api_cfn.pp b/manifests/profile/base/heat/api_cfn.pp
index 1014b04..a2f3287 100644
--- a/manifests/profile/base/heat/api_cfn.pp
+++ b/manifests/profile/base/heat/api_cfn.pp
@@ -77,7 +77,7 @@ class tripleo::profile::base::heat::api_cfn (
if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
include ::heat::api_cfn
- include ::apache::mod::ssl
+ include ::tripleo::profile::base::apache
class { '::heat::wsgi::apache_api_cfn':
ssl_cert => $tls_certfile,
ssl_key => $tls_keyfile,
diff --git a/manifests/profile/base/heat/api_cloudwatch.pp b/manifests/profile/base/heat/api_cloudwatch.pp
index 4caac9d..7e39028 100644
--- a/manifests/profile/base/heat/api_cloudwatch.pp
+++ b/manifests/profile/base/heat/api_cloudwatch.pp
@@ -77,7 +77,7 @@ class tripleo::profile::base::heat::api_cloudwatch (
if $step >= 4 or ( $step >= 3 and $is_bootstrap ) {
include ::heat::api_cloudwatch
- include ::apache::mod::ssl
+ include ::tripleo::profile::base::apache
class { '::heat::wsgi::apache_api_cloudwatch':
ssl_cert => $tls_certfile,
ssl_key => $tls_keyfile,