diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-02-15 15:16:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-02-15 15:16:20 +0000 |
| commit | 4af63c0b17c89799c57efb45bcf575110d54d9e3 (patch) | |
| tree | 73267a4328a6d0404612ef70afc12ac8d9262d45 /puppet/manifests | |
| parent | 89f39db00c315105d522b9c3753ce3759411aa55 (diff) | |
| parent | 6deccde41576341ae91e07b8ad837bfafdaa35e7 (diff) | |
Merge "Enable SSL middleware for cinder"
Diffstat (limited to 'puppet/manifests')
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 1 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller_pacemaker.pp | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 276093ba..bd95d95c 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -368,6 +368,7 @@ if hiera('step') >= 3 { include ::cinder include ::cinder::config + include ::tripleo::ssl::cinder_config include ::cinder::api include ::cinder::glance include ::cinder::scheduler diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp index 8fbb25ab..08fadac2 100644 --- a/puppet/manifests/overcloud_controller_pacemaker.pp +++ b/puppet/manifests/overcloud_controller_pacemaker.pp @@ -736,6 +736,7 @@ if hiera('step') >= 3 { include ::cinder include ::cinder::config + include ::tripleo::ssl::cinder_config class { '::cinder::api': sync_db => $sync_db, manage_service => false, |