From ab485d3ff3574fe1c37fc1c01d3d59b0a0ce000a Mon Sep 17 00:00:00 2001 From: Michael Polenchuk Date: Thu, 25 Oct 2018 12:21:34 +0400 Subject: Specify barbican endpoint for glance service By default castellan key manager gets public endpoint of barbican service which isn't preferable in terms of cluster ops, so specify internal endpoint explicitly. Change-Id: Ie686ceb936132143743af18fcb4960ea15a8b93c Signed-off-by: Michael Polenchuk --- mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 | 2 ++ mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 | 2 ++ 2 files changed, 4 insertions(+) diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 index 03610a64e..edb20e3b6 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j2 @@ -96,6 +96,8 @@ parameters: glance: server: <<: *db_conn_recycle_time + identity: + barbican_endpoint: ${barbican:server:host_href} {%- if conf.MCP_VCP %} heat: server: diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 index 6d09541a4..999fa7968 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j2 @@ -114,6 +114,8 @@ parameters: workers: 1 barbican: enabled: ${_param:barbican_integration_enabled} + identity: + barbican_endpoint: ${barbican:server:host_href} cinder: controller: barbican: -- cgit 1.2.3-korg