openstack/devstack
Code Issues Proposed changes

Merge "zuul job: write the enable_plugin lines last"

Browse Source
This commit is contained in:
Zuul 2019-03-12 18:45:21 +00:00 committed by Gerrit Code Review
commit 50e12947f8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
roles/write-devstack-local-conf/library/devstack_local_conf.py
View File

@ -214,11 +214,14 @@ class LocalConf(object):
self.base_dir = base_dir
self.projects = projects
self.project = project
if plugins:
self.handle_plugins(plugins)
if services or base_services:
self.handle_services(base_services, services or {})
self.handle_localrc(localrc)
# Plugins must be the last items in localrc, otherwise
# the configuration lines which follows them in the file are
# not applied to the plugins (for example, the value of DEST.)
if plugins:
self.handle_plugins(plugins)
if localconf:
self.handle_localconf(localconf)