From: Juan Antonio Osorio Robles <jaosorior@redhat.com>
Date: Thu, 8 Sep 2016 08:12:08 +0000 (+0300)
Subject: Add keystone networks for the different endpoints
X-Git-Tag: opnfv-6.0.0~1630^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=50b5f6ae4326ce3c1bc0e01a4b7ef5d8a9edb733;p=apex-tripleo-heat-templates.git

Add keystone networks for the different endpoints

Keystone doesn't provide different flags to indicate that both of its
endpoints are enabled. So currently we have to manually add its
network to all-nodes-config.

bp tls-via-certmogner

Change-Id: Ibecd78706e84853107f698ba411a0c05e6f5be52
---

diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index f499739a..c0a3b59e 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -99,6 +99,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}