diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-08-03 21:53:09 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-08-03 21:53:09 +0000 |
| commit | 1ea7c35f4ff73c47c9ee3856087d215e19066aed (patch) | |
| tree | f046dffde3dfa7e9caa342795839aa385b41ac21 | |
| parent | 45c95100cfd3ae63ae86a67e468baca0c9758dab (diff) | |
| parent | 7f84409a6a21ce09042d4923236d2b05251af3af (diff) | |
Merge "Make UpgradeLevelNovaCompute parameters consistent"
| -rw-r--r-- | puppet/services/nova-compute.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/nova-conductor.yaml | 2 | ||||
| -rwxr-xr-x | tools/yaml-validate.py | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/puppet/services/nova-compute.yaml b/puppet/services/nova-compute.yaml index a12bfd0f..6e1f3f56 100644 --- 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: > diff --git a/puppet/services/nova-conductor.yaml b/puppet/services/nova-conductor.yaml index a6638be0..5abad452 100644 --- 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]} diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index 3504620f..a096d69a 100755 --- 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'], |