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 <ykarel@redhat.com> Change-Id: I71b85b5cb018dd790e13aaa1eeefcbb8ac0b3b85 Closes-Bug: #1727613
This commit is contained in:
parent
8e8fbe9214
commit
c609524627
|
@ -130,7 +130,11 @@ function create_magnum_conf {
|
||||||
|
|
||||||
iniset $MAGNUM_CONF database connection `database_connection_url magnum`
|
iniset $MAGNUM_CONF database connection `database_connection_url magnum`
|
||||||
iniset $MAGNUM_CONF api host "$MAGNUM_SERVICE_HOST"
|
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 oslo_policy policy_file $MAGNUM_POLICY
|
||||||
|
|
||||||
iniset $MAGNUM_CONF keystone_auth auth_type password
|
iniset $MAGNUM_CONF keystone_auth auth_type password
|
||||||
|
@ -320,8 +324,7 @@ function start_magnum_api {
|
||||||
|
|
||||||
# Start proxies if enabled
|
# Start proxies if enabled
|
||||||
if is_service_enabled tls-proxy; then
|
if is_service_enabled tls-proxy; then
|
||||||
start_tls_proxy '*' $MAGNUM_SERVICE_PORT $MAGNUM_SERVICE_HOST $MAGNUM_SERVICE_PORT_INT &
|
start_tls_proxy magnum '*' $MAGNUM_SERVICE_PORT $MAGNUM_SERVICE_HOST $MAGNUM_SERVICE_PORT_INT &
|
||||||
start_tls_proxy '*' $EC2_SERVICE_PORT $MAGNUM_SERVICE_HOST $EC2_SERVICE_PORT_INT &
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue