diff --git a/devstack/plugin.sh b/devstack/plugin.sh index 0cbdceb27..a76a7cff0 100755 --- a/devstack/plugin.sh +++ b/devstack/plugin.sh @@ -78,6 +78,9 @@ function configure_murano_rpc_backend() { function configure_murano_glare_backend() { # Configure Murano to use GlARe application storage backend iniset $MURANO_CONF_FILE engine packages_service 'glare' + if is_service_enabled murano-cfapi; then + iniset $MURANO_CFAPI_CONF_FILE cfapi packages_service 'glare' + fi iniset $MURANO_CONF_FILE glare url $GLANCE_SERVICE_PROTOCOL://$GLANCE_GLARE_HOSTPORT iniset $MURANO_CONF_FILE glare endpoint_type $GLARE_ENDPOINT_TYPE echo -e $"\nexport MURANO_PACKAGES_SERVICE='glare'" | sudo tee -a $TOP_DIR/openrc diff --git a/murano/cfapi/cfapi.py b/murano/cfapi/cfapi.py index 3d226ec0f..abb51572d 100644 --- a/murano/cfapi/cfapi.py +++ b/murano/cfapi/cfapi.py @@ -299,7 +299,7 @@ class Controller(object): def _get_muranoclient(token_id, req): artifacts_client = None - if CONF.engine.packages_service in ['glance', 'glare']: + if CONF.cfapi.packages_service in ['glance', 'glare']: artifacts_client = _get_glareclient(token_id, req) murano_url = CONF.murano.url or req.endpoints.get('murano') diff --git a/murano/common/cf_config.py b/murano/common/cf_config.py index 2b5615829..9dc45e42e 100644 --- a/murano/common/cf_config.py +++ b/murano/common/cf_config.py @@ -33,7 +33,10 @@ cfapi_opts = [ cfg.StrOpt('user_domain_name', default='default', help=_('Domain name of the user')), cfg.StrOpt('project_domain_name', default='default', - help=_('Domain name of the project'))] + help=_('Domain name of the project')), + cfg.StrOpt('packages_service', default='murano', + help=_('Package service which should be used by service' + ' broker'))] CONF = cfg.CONF CONF.register_opts(cfapi_opts, group='cfapi') diff --git a/murano/opts.py b/murano/opts.py index dacfc2e80..ee1039b41 100644 --- a/murano/opts.py +++ b/murano/opts.py @@ -55,6 +55,7 @@ _opt_lists = [ _cfapi_opt_lists = [ ('cfapi', murano.common.cf_config.cfapi_opts), + ('glare', murano.common.config.glare_opts), ] _opt_lists.extend(oslo_service.sslutils.list_opts())