diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-05-27 20:01:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-05-27 20:01:40 +0000 |
| commit | 4c274512635686439bb5566fe86901a9269fbd3e (patch) | |
| tree | 59e68f7c14007aaa1679300fb8df2efcd8dbdbc1 | |
| parent | 5812cbd29af5247a5503e1963f14fe502f80088a (diff) | |
| parent | 41f0b76907416b8e6ea0f7a7b9de9985b77e79e7 (diff) | |
Merge "Map Heat services to isolated networks"
| -rw-r--r-- | overcloud-resource-registry-puppet.yaml | 3 | ||||
| -rw-r--r-- | puppet/controller-puppet.yaml | 6 |
2 files changed, 6 insertions, 3 deletions
diff --git a/overcloud-resource-registry-puppet.yaml b/overcloud-resource-registry-puppet.yaml index 8e26266b..fbd20bc6 100644 --- a/overcloud-resource-registry-puppet.yaml +++ b/overcloud-resource-registry-puppet.yaml @@ -75,3 +75,6 @@ parameter_defaults: KeystoneAdminApiNetwork: internal_api KeystonePublicApiNetwork: external NeutronApiNetwork: internal_api + HeatApiNetwork: internal_api + HeatApiCfnNetwork: internal_api + HeatApiCloudwatchNetwork: internal_api diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index 7e931976..f7ed3b5d 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -795,9 +795,9 @@ resources: heat::auth_uri: {get_input: keystone_auth_uri} heat::identity_uri: {get_input: keystone_identity_uri} heat::keystone_password: {get_input: heat_password} - heat::api::bind_host: {get_input: controller_host} - heat::api_cloudwatch::bind_host: {get_input: controller_host} - heat::api_cfn::bind_host: {get_input: controller_host} + heat::api::bind_host: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiNetwork]}]} + heat::api_cloudwatch::bind_host: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiCloudwatchNetwork]}]} + heat::api_cfn::bind_host: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiCfnNetwork]}]} heat::database_connection: {get_input: heat_dsn} heat::instance_user: heat-admin heat::debug: {get_input: debug} |