openstack/devstack
Code Issues Proposed changes

Merge "Allow jobs to disable all services"

Browse Source
This commit is contained in:
Zuul
2017-12-14 06:54:24 +00:00
committed by Gerrit Code Review
parent 924b1149c8 5551170ad3
commit f4cec2d9b5
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
roles/write-devstack-local-conf/README.rst
View File

@@ -54,6 +54,11 @@ Write the local.conf file for use by devstack
boolean value is ``false``, a ``disable_service`` line will be boolean value is ``false``, a ``disable_service`` line will be
emitted for the service name. If it is ``true``, then emitted for the service name. If it is ``true``, then
``enable_service`` will be emitted. All other values are ignored. ``enable_service`` will be emitted. All other values are ignored.
The special key ``base`` can be used to enable or disable the base set of
services enabled by default. If ``base`` is found, it will processed before
all other keys. If its value is ``False`` a ``disable_all_services`` will be
emitted; if its value is ``True`` nothing will be emitted since base
services are enabled by default.
.. zuul:rolevar:: devstack_plugins .. zuul:rolevar:: devstack_plugins
:type: dict :type: dict

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

@@ -124,6 +124,9 @@ class LocalConf(object):
self.localrc.append('enable_plugin {} {}'.format(k, v)) self.localrc.append('enable_plugin {} {}'.format(k, v))
def handle_services(self, services): def handle_services(self, services):
base_services = services.pop('base', True)
if not base_services:
self.localrc.append('disable_all_services')
for k, v in services.items(): for k, v in services.items():
if v is False: if v is False:
self.localrc.append('disable_service {}'.format(k)) self.localrc.append('disable_service {}'.format(k))