From 4b62b6bfc9db4e318ae25221e9d5e606fff8e996 Mon Sep 17 00:00:00 2001 From: Jay Pipes Date: Thu, 5 Jul 2018 08:06:12 -0400 Subject: [PATCH] make incomplete_consumer_project_id a valid UUID Unfortunately, when I added the CONF.incomplete_consumer_project_id and CONF.incomplete_consumer_user_id options, the default value for those options was an invalid UUID (it had 13 zeroes for the last part of the UUID instead of 12). This is preventing some work that tries to disable warnings about invalid UUIDs being stored in ovo UUIDField objects. The work to "heal allocations" will be able to fix up any deployments that deployed the invalid UUID default CONF value because it looks for any instances in Nova where the placement allocation records don't have a matching user/project and replaces the mismatched user/project IDs on the consumer appropriately. Change-Id: I67b3b771f20e0b83225fce4839d378696fe1ab24 Closes-bug: #1780107 --- nova/conf/placement.py | 2 +- .../api/openstack/placement/gabbits/ensure-consumer.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nova/conf/placement.py b/nova/conf/placement.py index 0bafd79bd96a..31eb3b403a8d 100644 --- a/nova/conf/placement.py +++ b/nova/conf/placement.py @@ -17,7 +17,7 @@ from nova.conf import utils as confutils DEFAULT_SERVICE_TYPE = 'placement' -DEFAULT_CONSUMER_MISSING_ID = '00000000-0000-0000-0000-0000000000000' +DEFAULT_CONSUMER_MISSING_ID = '00000000-0000-0000-0000-000000000000' placement_group = cfg.OptGroup( 'placement', diff --git a/nova/tests/functional/api/openstack/placement/gabbits/ensure-consumer.yaml b/nova/tests/functional/api/openstack/placement/gabbits/ensure-consumer.yaml index c9504d7d6969..512b3deb6f80 100644 --- a/nova/tests/functional/api/openstack/placement/gabbits/ensure-consumer.yaml +++ b/nova/tests/functional/api/openstack/placement/gabbits/ensure-consumer.yaml @@ -11,7 +11,7 @@ defaults: openstack-api-version: placement 1.7 vars: -- &default_incomplete_id 00000000-0000-0000-0000-0000000000000 +- &default_incomplete_id 00000000-0000-0000-0000-000000000000 tests: - name: put an allocation without project/user (1.7)