openstack/placement
Code Issues Proposed changes

Merge "Only auto-disable new nova-compute services"

Browse Source
This commit is contained in:
Jenkins 2017-06-30 17:15:27 +00:00 committed by Gerrit Code Review
commit 9cc0e6784e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nova/db/sqlalchemy/api.py
View File

@ -584,8 +584,13 @@ def service_get_by_compute_host(context, host):
def service_create(context, values):
service_ref = models.Service()
service_ref.update(values)
if not CONF.enable_new_services:
msg = _("New service disabled due to config option.")
# We only auto-disable nova-compute services since those are the only
# ones that can be enabled using the os-services REST API and they are
# the only ones where being disabled means anything. It does
# not make sense to be able to disable non-compute services like
# nova-scheduler or nova-osapi_compute since that does nothing.
if not CONF.enable_new_services and values.get('binary') == 'nova-compute':
msg = _("New compute service disabled due to config option.")
service_ref.disabled = True
service_ref.disabled_reason = msg
try: