From c6095246279025603e974e75a984ff86e3f07e2a Mon Sep 17 00:00:00 2001 From: chenlx Date: Thu, 26 Oct 2017 14:12:50 +0800 Subject: [PATCH] Fix: magnum devstack installation with tls-proxy Fix wrongly used start_tls_proxy function and correctly set api port when tls-proxy is enabled. Also remove start_tls_proxy for ec2 which is not required. Co-Authored-By: yatin Change-Id: I71b85b5cb018dd790e13aaa1eeefcbb8ac0b3b85 Closes-Bug: #1727613 --- devstack/lib/magnum | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/devstack/lib/magnum b/devstack/lib/magnum index 82d303abbe..3d62b66020 100644 --- a/devstack/lib/magnum +++ b/devstack/lib/magnum @@ -130,7 +130,11 @@ function create_magnum_conf { iniset $MAGNUM_CONF database connection `database_connection_url magnum` iniset $MAGNUM_CONF api host "$MAGNUM_SERVICE_HOST" - iniset $MAGNUM_CONF api port "$MAGNUM_SERVICE_PORT" + if is_service_enabled tls-proxy; then + iniset $MAGNUM_CONF api port "$MAGNUM_SERVICE_PORT_INT" + else + iniset $MAGNUM_CONF api port "$MAGNUM_SERVICE_PORT" + fi iniset $MAGNUM_CONF oslo_policy policy_file $MAGNUM_POLICY iniset $MAGNUM_CONF keystone_auth auth_type password @@ -320,8 +324,7 @@ function start_magnum_api { # Start proxies if enabled if is_service_enabled tls-proxy; then - start_tls_proxy '*' $MAGNUM_SERVICE_PORT $MAGNUM_SERVICE_HOST $MAGNUM_SERVICE_PORT_INT & - start_tls_proxy '*' $EC2_SERVICE_PORT $MAGNUM_SERVICE_HOST $EC2_SERVICE_PORT_INT & + start_tls_proxy magnum '*' $MAGNUM_SERVICE_PORT $MAGNUM_SERVICE_HOST $MAGNUM_SERVICE_PORT_INT & fi }