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/nova | |
parent | 97aac6a58c30d044cc04f67829d74c98f56d28ba (diff) | |
parent | 9e729c0db22865d036860346eb6b81c4c2108719 (diff) |
Merge "Ensure we configure ssl.conf"
Diffstat (limited to 'manifests/profile/base/nova')
-rw-r--r-- | manifests/profile/base/nova/api.pp | 1 | ||||
-rw-r--r-- | manifests/profile/base/nova/placement.pp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/manifests/profile/base/nova/api.pp b/manifests/profile/base/nova/api.pp index 95a1721..bdb3007 100644 --- a/manifests/profile/base/nova/api.pp +++ b/manifests/profile/base/nova/api.pp @@ -94,6 +94,7 @@ class tripleo::profile::base::nova::api ( $tls_keyfile = undef } if $step >= 4 or ($step >= 3 and $sync_db) { + include ::apache::mod::ssl class { '::nova::wsgi::apache_api': ssl_cert => $tls_certfile, ssl_key => $tls_keyfile, diff --git a/manifests/profile/base/nova/placement.pp b/manifests/profile/base/nova/placement.pp index 16bfe17..c78b3c2 100644 --- a/manifests/profile/base/nova/placement.pp +++ b/manifests/profile/base/nova/placement.pp @@ -74,6 +74,7 @@ class tripleo::profile::base::nova::placement ( } if $step >= 3 { + include ::apache::mod::ssl class { '::nova::wsgi::apache_placement': ssl_cert => $tls_certfile, ssl_key => $tls_keyfile, |