From 9036e73afebd8742a90827bb7e5f6d74e4421677 Mon Sep 17 00:00:00 2001 From: Juan Antonio Osorio Robles Date: Fri, 27 May 2016 13:57:07 +0300 Subject: 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 --- puppet/manifests/overcloud_controller.pp | 1 - puppet/manifests/overcloud_controller_pacemaker.pp | 1 - 2 files changed, 2 deletions(-) (limited to 'puppet') 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, -- cgit 1.2.3-korg