Combine Heat API networks into single net
We probably don't need to split out separate networks for Heat CFN and Cloudwatch. Just having a single network for Heat API in the overcloud is probably fine. Change-Id: I917b314e01227af72129645c9b72ad8e54f07865
This commit is contained in:
parent
17028aa9c2
commit
ab6d15482f
|
@ -507,8 +507,6 @@ parameters:
|
|||
KeystonePublicApiNetwork: external
|
||||
NeutronApiNetwork: internal_api
|
||||
HeatApiNetwork: internal_api
|
||||
HeatApiCfnNetwork: internal_api
|
||||
HeatApiCloudwatchNetwork: internal_api
|
||||
NovaApiNetwork: internal_api
|
||||
NovaMetadataNetwork: internal_api
|
||||
SwiftMgmtNetwork: storage_mgmt
|
||||
|
|
|
@ -694,8 +694,6 @@ resources:
|
|||
glance_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
|
||||
glance_registry_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, GlanceRegistryNetwork]}]}
|
||||
heat_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiNetwork]}]}
|
||||
heat_api_cloudwatch_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiCloudwatchNetwork]}]}
|
||||
heat_api_cfn_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiCfnNetwork]}]}
|
||||
keystone_public_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}
|
||||
keystone_admin_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
|
||||
mongo_db_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MongoDbNetwork]}]}
|
||||
|
@ -816,8 +814,8 @@ resources:
|
|||
heat::identity_uri: {get_input: keystone_identity_uri}
|
||||
heat::keystone_password: {get_input: heat_password}
|
||||
heat::api::bind_host: {get_input: heat_api_network}
|
||||
heat::api_cloudwatch::bind_host: {get_input: heat_api_cloudwatch_network}
|
||||
heat::api_cfn::bind_host: {get_input: heat_api_cfn_network}
|
||||
heat::api_cloudwatch::bind_host: {get_input: heat_api_network}
|
||||
heat::api_cfn::bind_host: {get_input: heat_api_network}
|
||||
heat::database_connection: {get_input: heat_dsn}
|
||||
heat::instance_user: heat-admin
|
||||
heat::debug: {get_input: debug}
|
||||
|
|
Loading…
Reference in New Issue