aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-08-13 08:30:37 +0000
committerGerrit Code Review <review@openstack.org>2016-08-13 08:30:37 +0000
commit443f641767297d682f34a7427bb7507779373ff5 (patch)
treec980b8fdc548ad02a6b62b84271bde762a87eff9 /puppet
parent8c61510e601473cabd60264eff7fc5b6f9f2ebb8 (diff)
parent90978109348009581919af7339ad0b7c5822f8e2 (diff)
Merge "Remove KeystoneRegion from controller.yaml"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/controller.yaml5
1 files changed, 0 insertions, 5 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 182b46ba..d13a6c6f 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -137,10 +137,6 @@ parameters:
type: string
constraints:
- custom_constraint: nova.keypair
- KeystoneRegion:
- type: string
- default: 'regionOne'
- description: Keystone region for endpoint
ManageFirewall:
default: false
description: Whether to manage IPtables rules.
@@ -557,7 +553,6 @@ resources:
heat_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, HeatApiNetwork]}]}
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]}]}
- keystone_region: {get_param: KeystoneRegion}
manila_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, ManilaApiNetwork]}]}
mongo_db_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MongoDbNetwork]}]}
neutron_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, NeutronApiNetwork]}]}