summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-05-27 13:57:07 +0300
committerJuan Antonio Osorio Robles <jaosorior@redhat.com>2016-05-27 14:04:13 +0300
commit9036e73afebd8742a90827bb7e5f6d74e4421677 (patch)
tree459d8957ed229c371d955e366fd3e1bc0ebb77b8 /puppet
parentb0223d3108e453236515038618a94746283e6e28 (diff)
Remove custom SSL-related resource for cinder
Now that cinder includes http_proxy_to_wsgi by default[1] our puppet resource that included it in cinder's api-paste config is not longer needed. [1] If5aab9cc25a2e7c66a0bb13b5f7488a667b30309 Change-Id: I6141b6caf9b04ee73fae3ae2b94b3001b21b9999
Diffstat (limited to 'puppet')
-rw-r--r--puppet/manifests/overcloud_controller.pp1
-rw-r--r--puppet/manifests/overcloud_controller_pacemaker.pp1
2 files changed, 0 insertions, 2 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 8b2dc8b0..536c680f 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -315,7 +315,6 @@ if hiera('step') >= 4 {
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 932012ad..30345694 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -542,7 +542,6 @@ MYSQL_HOST=localhost\n",
include ::cinder
include ::cinder::config
- include ::tripleo::ssl::cinder_config
class { '::cinder::api':
sync_db => $sync_db,
manage_service => false,