summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-16 12:05:25 +0000
committerGerrit Code Review <review@openstack.org>2017-06-16 12:05:25 +0000
commitba875e3edd4ffaa0b19e3af1646d69a0e39b2f50 (patch)
tree117f7b632404ad7dfd53bc56f60bc71b885f316e
parent64802aadebafaa0264188803348b644a0859b5bc (diff)
parentead742e169d3ac5c5907ca1a526474bfa0dc1e06 (diff)
Merge "Fix the port for Panko API"
-rw-r--r--elements/puppet-stack-config/puppet-stack-config.yaml.template2
-rw-r--r--instack_undercloud/undercloud.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/elements/puppet-stack-config/puppet-stack-config.yaml.template b/elements/puppet-stack-config/puppet-stack-config.yaml.template
index 267babc..6c727cd 100644
--- a/elements/puppet-stack-config/puppet-stack-config.yaml.template
+++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template
@@ -976,5 +976,5 @@ tripleo::firewall::firewall_rules:
976 - 443 976 - 443
977 '143 panko-api': 977 '143 panko-api':
978 dport: 978 dport:
979 - 8779 979 - 8977
980 - 13779 980 - 13779
diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py
index e1ac678..6ae0859 100644
--- a/instack_undercloud/undercloud.py
+++ b/instack_undercloud/undercloud.py
@@ -864,8 +864,8 @@ def _generate_endpoints(instack_env):
864 {'host': internal_host, 'port': 8041}), 864 {'host': internal_host, 'port': 8041}),
865 ('panko', 865 ('panko',
866 '%s://%s:%d', 866 '%s://%s:%d',
867 {'host': public_host, 'port': 8779, 'ssl_port': 13779}, 867 {'host': public_host, 'port': 8977, 'ssl_port': 13779},
868 {'host': internal_host, 'port': 8779}), 868 {'host': internal_host, 'port': 8977}),
869 ('mistral', 869 ('mistral',
870 '%s://%s:%d/v2', 870 '%s://%s:%d/v2',
871 {'host': public_host, 'port': 8989, 'ssl_port': 13989}, 871 {'host': public_host, 'port': 8989, 'ssl_port': 13989},