From c02a3436239df79ddecddde171b286f92aea2c10 Mon Sep 17 00:00:00 2001
From: Ben Nemec <bnemec@redhat.com>
Date: Tue, 27 Jun 2017 10:26:08 -0500
Subject: Make Deploy/UpdateIdentifier definition semi-consistent

It seems UpdateIdentifier is an overloaded parameter - it is used
both to trigger package updates in the minor update case as well as
to trigger the upgrade steps during a major upgrade.  I'm not sure
it's appropriate to change either of the descriptions as a result,
so for the moment that is added to the exclusion list.

Change-Id: Ied36cf259f6a6e5c8cfa7a01722fb7fda6900976
Partial-Bug: 1700664
---
 tools/yaml-validate.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'tools/yaml-validate.py')

diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py
index d6d5194f..438f196e 100755
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@@ -56,6 +56,7 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
                                    'TenantNetCidr': ['default'],
                                    'TenantAllocationPools': ['default'],
                                    'InternalApiNetCidr': ['default'],
+                                   'UpdateIdentifier': ['description'],
                                    # TODO(bnemec): Address these existing
                                    # inconsistencies.
                                    'NeutronMetadataProxySharedSecret': [
@@ -98,8 +99,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
                                    'OVNSouthboundServerPort': ['description'],
                                    'ExternalInterfaceDefaultRoute':
                                        ['description', 'default'],
-                                   'DeployIdentifier': ['description',
-                                                        'default'],
                                    'ExternalIpUri': ['description'],
                                    'IPPool': ['description'],
                                    'ControlPlaneNetwork': ['description'],
@@ -110,8 +109,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
                                    'InternalApiAllocationPools': ['default'],
                                    'NodeIndex': ['description'],
                                    'SwiftPassword': ['description'],
-                                   'UpdateIdentifier': ['description',
-                                                        'default'],
                                    'name': ['description', 'default'],
                                    'StorageNetName': ['description'],
                                    'ManagementNetName': ['description'],
-- 
cgit 1.2.3-korg