diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-10-25 12:21:34 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2018-10-29 13:10:22 +0400 |
| commit | 532427ad43e1c1728bf21317aea6af00d9758227 (patch) | |
| tree | 678d723b2fee4454e07f24cd9cb1ca47f3ae1274 | |
| parent | c437e37d989ef882e258f06898f185909b337621 (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>
3 files changed, 5 insertions, 1 deletions
diff --git a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch index 7126e7d65..5ad57bb5f 100644 --- a/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch +++ b/mcp/patches/docker/0002-OPNFV-package-installation-Ubuntu-user.patch @@ -33,7 +33,7 @@ index 2c75586..d7d4c49 100644 ARG RECLASS_BASE="/srv/salt/reclass" ENV RECLASS_BASE $RECLASS_BASE - RUN echo "Layer python/salt module prerequisites, formulas" \ -+ RUN echo "Layer python/salt module prerequisites, formulas (26 Oct 2018)" \ ++ RUN echo "Layer python/salt module prerequisites, formulas (29 Oct 2018)" \ && mkdir -p /srv/salt \ && curl -sSqL https://raw.githubusercontent.com/salt-formulas/salt-formulas-scripts/master/formula-fetch.sh -o /srv/salt/formula-fetch.sh \ && bash -c 'source /srv/salt/formula-fetch.sh && setupPyEnv && fetchAll' \ 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: |