summaryrefslogtreecommitdiffstats
path: root/network/endpoints
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-03-05 02:20:16 +0000
committerGerrit Code Review <review@openstack.org>2016-03-05 02:20:16 +0000
commit00e47eaf5b4d00ca59a8ce75a7f7a9a928dbf5c7 (patch)
tree643a347b071f5672421ad7946697b00872b06d34 /network/endpoints
parent205ea09ca27caaeaddab27f3b021b398db195890 (diff)
parent321e605a0a4c219415a3876a84fa063410380cac (diff)
Merge "Add IPv6 Support to Isolated Networks"
Diffstat (limited to 'network/endpoints')
-rwxr-xr-xnetwork/endpoints/build_endpoint_map.py5
-rw-r--r--network/endpoints/endpoint_map.yaml5
2 files changed, 8 insertions, 2 deletions
diff --git a/network/endpoints/build_endpoint_map.py b/network/endpoints/build_endpoint_map.py
index 056d6889..d8cdee3d 100755
--- a/network/endpoints/build_endpoint_map.py
+++ b/network/endpoints/build_endpoint_map.py
@@ -173,7 +173,10 @@ def template_endpoint_items(config):
def generate_endpoint_map_template(config):
return collections.OrderedDict([
('heat_template_version', '2015-04-30'),
- ('description', 'A map of OpenStack endpoints.'),
+ ('description', 'A map of OpenStack endpoints. Since the endpoints '
+ 'are URLs, we need to have brackets around IPv6 IP addresses. The '
+ 'inputs to these parameters come from net_ip_uri_map, which will '
+ 'include these brackets in IPv6 addresses.'),
('parameters', template_parameters(config)),
('outputs', {
'endpoint_map': {
diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml
index bb0413a5..0382533a 100644
--- a/network/endpoints/endpoint_map.yaml
+++ b/network/endpoints/endpoint_map.yaml
@@ -3,7 +3,10 @@
### by the script build_endpoint_map.py
heat_template_version: '2015-04-30'
-description: A map of OpenStack endpoints.
+description: A map of OpenStack endpoints. Since the endpoints are URLs,
+ we need to have brackets around IPv6 IP addresses. The inputs to these
+ parameters come from net_ip_uri_map, which will include these brackets
+ in IPv6 addresses.
parameters:
AodhApiVirtualIP: {type: string, default: ''}
CeilometerApiVirtualIP: {type: string, default: ''}