From 7da2cf55823ca28983e123cfc000dce2aeedfac0 Mon Sep 17 00:00:00 2001 From: Ovidiu Poncea Date: Thu, 22 Mar 2018 05:41:58 -0400 Subject: [PATCH] puppet-cinder: Fix cinder calling nova over public ip Using public ip leads to SSL certificate failures on HTTPS enabled deployments. Cinder stopped using two cinder.conf options, nova_catalog_info and nova_catalog_admin_info. The two options are replaced by [nova]/interface. Upstream puppet is still using the two options although cinder seems to have stopped. Change-Id: I1c5b11d26d90bfe36045dacc4335997a1c5141b6 --- puppet-manifests/src/hieradata/controller.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/puppet-manifests/src/hieradata/controller.yaml b/puppet-manifests/src/hieradata/controller.yaml index 520c3f7480..8b5f98663f 100644 --- a/puppet-manifests/src/hieradata/controller.yaml +++ b/puppet-manifests/src/hieradata/controller.yaml @@ -347,9 +347,7 @@ cinder::rpc_response_timeout: 180 cinder::backend_host: 'controller' cinder::image_conversion_dir: '/opt/img-conversions/cinder' - -cinder::api::nova_catalog_info: 'compute:nova:internalURL' -cinder::api::nova_catalog_admin_info: 'compute:nova:adminURL' +cinder::api::nova_interface: 'internal' cinder::api::enable_proxy_headers_parsing: true cinder::ceilometer::notification_driver: 'messaging'