Make service broker work with GLARE again.

After separation service broker from native murano on the configs/db
level GLARE support was broken. This patch updates config, devstack
script and partially service broker itself to take support back.

Change-Id: I0ea99bc491ba2ddebfc34a9c0aa681432aca7801
Closes-Bug: #1610130
This commit is contained in:
Nikolay Starodubtsev 2016-08-05 13:58:47 +03:00
parent a4c8f3bb56
commit e689487338
4 changed files with 9 additions and 2 deletions

View File

@ -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

View File

@ -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')

View File

@ -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')

View File

@ -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())