aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2018-10-25 12:21:34 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2018-10-29 13:10:22 +0400
commit532427ad43e1c1728bf21317aea6af00d9758227 (patch)
tree678d723b2fee4454e07f24cd9cb1ca47f3ae1274 /mcp/reclass
parentc437e37d989ef882e258f06898f185909b337621 (diff)
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 <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass')
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-ha/openstack_control.yml.j22
-rw-r--r--mcp/reclass/classes/cluster/mcp-common-noha/openstack_control.yml.j22
2 files changed, 4 insertions, 0 deletions
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: