diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-19 10:45:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-19 10:45:55 +0000 |
| commit | d5471212123fee21cc44175362cf36e9449a2484 (patch) | |
| tree | da26c83dc37647b81d6134e2d5e65b1674a06e13 /manifests/profile/base/heat | |
| parent | 97aac6a58c30d044cc04f67829d74c98f56d28ba (diff) | |
| parent | 9e729c0db22865d036860346eb6b81c4c2108719 (diff) | |
Merge "Ensure we configure ssl.conf"
Diffstat (limited to 'manifests/profile/base/heat')
| -rw-r--r-- | manifests/profile/base/heat/api.pp | 1 | ||||
| -rw-r--r-- | manifests/profile/base/heat/api_cfn.pp | 1 | ||||
| -rw-r--r-- | manifests/profile/base/heat/api_cloudwatch.pp | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/manifests/profile/base/heat/api.pp b/manifests/profile/base/heat/api.pp index 8e2da7e..79eb77e 100644 --- a/manifests/profile/base/heat/api.pp +++ b/manifests/profile/base/heat/api.pp @@ -65,6 +65,7 @@ class tripleo::profile::base::heat::api ( if $step >= 3 { include ::heat::api + include ::apache::mod::ssl 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 02eb82a..dad7b76 100644 --- a/manifests/profile/base/heat/api_cfn.pp +++ b/manifests/profile/base/heat/api_cfn.pp @@ -66,6 +66,7 @@ class tripleo::profile::base::heat::api_cfn ( if $step >= 3 { include ::heat::api_cfn + include ::apache::mod::ssl 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 558d247..428bcf2 100644 --- a/manifests/profile/base/heat/api_cloudwatch.pp +++ b/manifests/profile/base/heat/api_cloudwatch.pp @@ -66,6 +66,7 @@ class tripleo::profile::base::heat::api_cloudwatch ( if $step >= 3 { include ::heat::api_cloudwatch + include ::apache::mod::ssl class { '::heat::wsgi::apache_api_cloudwatch': ssl_cert => $tls_certfile, ssl_key => $tls_keyfile, |