Skip to content

Commit 610927f

Browse files
committed
zuul job: write the enable_plugin lines last
Plugins must be the last items in the local.conf file otherwise the configuration set in the rest of the file is not applied to them (for example a different value of DEST.) Change-Id: Ia001badca179c3f3436d5ecd26b0755a3f3a3078
1 parent 5488336 commit 610927f

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

roles/write-devstack-local-conf/library/devstack_local_conf.py

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -214,11 +214,14 @@ def __init__(self, localrc, localconf, base_services, services, plugins,
214214
self.base_dir = base_dir
215215
self.projects = projects
216216
self.project = project
217-
if plugins:
218-
self.handle_plugins(plugins)
219217
if services or base_services:
220218
self.handle_services(base_services, services or {})
221219
self.handle_localrc(localrc)
220+
# Plugins must be the last items in localrc, otherwise
221+
# the configuration lines which follows them in the file are
222+
# not applied to the plugins (for example, the value of DEST.)
223+
if plugins:
224+
self.handle_plugins(plugins)
222225
if localconf:
223226
self.handle_localconf(localconf)
224227

0 commit comments

Comments
 (0)