From ead742e169d3ac5c5907ca1a526474bfa0dc1e06 Mon Sep 17 00:00:00 2001 From: ZhongShengping Date: Wed, 7 Jun 2017 11:58:44 +0800 Subject: [PATCH] Fix the port for Panko API The port used for Panko is conflicts with Trove[1]. According to the official documentation[2] this should be 8777. The 8777 port has been occupied by ceilometer. So set the panko api port to 8977. [1]https://github.com/openstack/trove/blob/master/etc/apache2/trove#L20 [2]https://docs.openstack.org/developer/panko/install/manual.html#installing-the-api-server Change-Id: I3f07bb823f409c9dbf03b3ee2f82c5bb1f35fd20 Closes-Bug: #1691283 Depends-On: I53b286d1d6466b574fdb286cc45f3138f96dff59 --- .../puppet-stack-config/puppet-stack-config.yaml.template | 2 +- instack_undercloud/undercloud.py | 4 ++-- 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 307a2d0fe..00c0c2232 100644 --- a/elements/puppet-stack-config/puppet-stack-config.yaml.template +++ b/elements/puppet-stack-config/puppet-stack-config.yaml.template @@ -973,5 +973,5 @@ tripleo::firewall::firewall_rules: - 443 '143 panko-api': dport: - - 8779 + - 8977 - 13779 diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py index ffc16b6fe..e04b1a96e 100644 --- a/instack_undercloud/undercloud.py +++ b/instack_undercloud/undercloud.py @@ -849,8 +849,8 @@ def _generate_endpoints(instack_env): {'host': internal_host, 'port': 8041}), ('panko', '%s://%s:%d', - {'host': public_host, 'port': 8779, 'ssl_port': 13779}, - {'host': internal_host, 'port': 8779}), + {'host': public_host, 'port': 8977, 'ssl_port': 13779}, + {'host': internal_host, 'port': 8977}), ('mistral', '%s://%s:%d/v2', {'host': public_host, 'port': 8989, 'ssl_port': 13989},