summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-04 05:18:43 +0000
committerGerrit Code Review <review@openstack.org>2016-10-04 05:18:43 +0000
commit81b9392886224b8516a297e5bd957560cf14cb5d (patch)
tree3e03bb3edc1ca0aea2ac585b36c60647d360532a /puppet
parent575bf581ea359aded71683f5db6bef5ebebaeaa6 (diff)
parentc947008d9e2d36f4a68f18ff1f56fa5b9bf21873 (diff)
Merge "Make keystone api network hiera composable"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/all-nodes-config.yaml20
1 files changed, 0 insertions, 20 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 89f2705e..67dc056b 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -28,10 +28,6 @@ parameters:
type: comma_delimited_list
memcache_node_ips:
type: comma_delimited_list
- keystone_public_api_node_ips:
- type: comma_delimited_list
- keystone_admin_api_node_ips:
- type: comma_delimited_list
NetVipMap:
type: json
RedisVirtualIP:
@@ -142,22 +138,6 @@ resources:
list_join:
- "]','inet6:["
- {get_param: memcache_node_ips}
- keystone_public_api_node_ips:
- str_replace:
- template: "['SERVERS_LIST']"
- params:
- SERVERS_LIST:
- list_join:
- - "','"
- - {get_param: keystone_public_api_node_ips}
- keystone_admin_api_node_ips:
- str_replace:
- template: "['SERVERS_LIST']"
- params:
- SERVERS_LIST:
- list_join:
- - "','"
- - {get_param: keystone_admin_api_node_ips}
deploy_identifier: {get_param: DeployIdentifier}
update_identifier: {get_param: UpdateIdentifier}