aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-09 11:28:14 +0000
committerGerrit Code Review <review@openstack.org>2016-09-09 11:28:14 +0000
commit1be640af938fc5685352a94124c287ad4a3fabb9 (patch)
treee2e38f6f332fe64af4b464553efe4f10c83135a7 /puppet
parent56486057c7c242745a4d44df5a03947ef49b49e7 (diff)
parent50b5f6ae4326ce3c1bc0e01a4b7ef5d8a9edb733 (diff)
Merge "Add keystone networks for the different endpoints"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/all-nodes-config.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index 2ef30005..d16341df 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -112,6 +112,11 @@ resources:
SERVICE:
str_split: [',', {get_param: enabled_services}]
- values: {get_param: ServiceNetMap}
+ # Keystone doesn't provide separate entries for the public
+ # and admin endpoints, so we need to add them here manually
+ # like we do in the vip-config below
+ - keystone_admin_api_network: {get_param: [ServiceNetMap, keystone_admin_api_network]}
+ keystone_public_api_network: {get_param: [ServiceNetMap, keystone_public_api_network]}
# provides a mapping of service_name_ips to a list of IPs
- {get_param: service_ips}
- {get_param: service_node_names}