openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Set TripleoUI bind_host via ServiceNetMap"

This commit is contained in:
Zuul 2018-03-25 07:26:12 +00:00 committed by Gerrit Code Review
parent c7d559ad0b 2c1f866bf2
commit 84c895fd4a
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
network/service_net_map.j2.yaml
View File

@ -77,6 +77,7 @@ parameters:
ZaqarApiNetwork: internal_api
DockerRegistryNetwork: ctlplane
PacemakerRemoteNetwork: internal_api
TripleoUINetwork: internal_api
# We special-case the default ResolveNetwork for the CephStorage role
# for backwards compatibility, all other roles default to internal_api
CephStorageHostnameResolveNetwork: storage

10
puppet/services/tripleo-ui.yaml
View File

@ -80,10 +80,12 @@ outputs:
tripleo::ui::endpoint_config_mistral: {get_param: [EndpointMap, MistralUIConfig, uri]}
tripleo::ui::endpoint_config_nova: {get_param: [EndpointMap, NovaUIConfig, uri]}
tripleo::ui::endpoint_config_swift: {get_param: [EndpointMap, SwiftUIConfig, uri]}
# FIXME(mandre) we're required to set bind_host otherwise it
# complains that it can't find the controller_host hiera key
tripleo::ui::bind_host: "127.0.0.1"
tripleo::ui::bind_host:
str_replace:
template:
"%{hiera('$NETWORK')}"
params:
$NETWORK: {get_param: [ServiceNetMap, TripleoUINetwork]}
step_config: |
include ::tripleo::ui
service_config_settings: {}