diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-06-04 13:36:51 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-06-04 13:36:51 +0000 |
| commit | 11c00004416cc6c4e7a49d1542ee180fde03fd2c (patch) | |
| tree | 63ec7c3f8c4fb80ffaa7420a6e3eb1c94cfc7034 /puppet | |
| parent | 4ae1b72673b519797ecb8a44cbe96089366777dc (diff) | |
| parent | ab6d15482f6cfce69fadbb5218bd645ea4f7fdf8 (diff) | |
Merge "Combine Heat API networks into single net"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/controller-puppet.yaml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml index c874108a..0da10fc8 100644 --- a/puppet/controller-puppet.yaml +++ b/puppet/controller-puppet.yaml @@ -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} |