Merge "Make UpgradeLevelNovaCompute parameters consistent"

2017-08-03 21:53:09 +00:00 · 2017-08-03 21:53:09 +00:00 · 1ea7c35f4f
commit 1ea7c35f4f
parent 45c95100cf 7f84409a6a
3 changed files with 2 additions and 3 deletions
--- a/puppet/services/nova-compute.yaml
+++ b/puppet/services/nova-compute.yaml
@ -97,7 +97,7 @@ parameters:
  UpgradeLevelNovaCompute:
    type: string
    description: Nova Compute upgrade level
-    default: auto
+    default: ''
  MigrationSshKey:
    type: json
    description: >
--- a/puppet/services/nova-conductor.yaml
+++ b/puppet/services/nova-conductor.yaml
@ -45,7 +45,7 @@ parameters:
  UpgradeLevelNovaCompute:
    type: string
    description: Nova Compute upgrade level
-    default: auto
+    default: ''

 conditions:
  nova_workers_zero: {equals : [{get_param: NovaWorkers}, 0]}
--- a/tools/yaml-validate.py
+++ b/tools/yaml-validate.py
@ -75,7 +75,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
                                   'NeutronBigswitchLLDPEnabled': ['default'],
                                   'NeutronWorkers': ['description'],
                                   'ServerMetadata': ['description'],
-                                   'UpgradeLevelNovaCompute': ['default'],
                                   'server': ['description'],
                                   'servers': ['description'],
                                   'ExtraConfig': ['description'],