From 11167e829e1c0636c26cfd75295311b0e9d89fbf Mon Sep 17 00:00:00 2001 From: zhurong Date: Thu, 10 Aug 2017 15:14:06 +0800 Subject: [PATCH] Using oslo generator config file generate murano config Change-Id: I0ebbe4349960119854151875fdea458b0a142053 --- devstack/plugin.sh | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 6a6147256..b3fbe1191 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -155,11 +155,8 @@ function configure_murano { mkdir_chown_stack "$MURANO_CONF_DIR" # Generate Murano configuration file and configure common parameters. - oslo-config-generator --namespace keystonemiddleware.auth_token \ - --namespace murano \ - --namespace oslo.db \ - --namespace oslo.messaging \ - > $MURANO_CONF_FILE + oslo-config-generator --config-file $MURANO_DIR/etc/oslo-config-generator/murano.conf --output-file $MURANO_CONF_FILE + cp $MURANO_DIR/etc/murano/murano-paste.ini $MURANO_CONF_DIR cleanup_murano @@ -232,10 +229,8 @@ function set_packages_service_backend() { function configure_murano_cfapi { # Generate Murano configuration file and configure common parameters. - oslo-config-generator --namespace keystonemiddleware.auth_token \ - --namespace murano.cfapi \ - --namespace oslo.db \ - > $MURANO_CFAPI_CONF_FILE + oslo-config-generator --config-file $MURANO_DIR/etc/oslo-config-generator/murano-cfapi.conf --output-file $MURANO_CFAPI_CONF_FILE + cp $MURANO_DIR/etc/murano/murano-cfapi-paste.ini $MURANO_CONF_DIR configure_service_broker