diff options
| author |   Steven Hardy <shardy@redhat.com> | 2017-08-23 08:39:18 +0100 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2017-08-31 03:55:30 +0000 |
| commit | af7146888bfc8888bf1086d8a23c36d32130ae10 (patch) | |
| tree | d8fa55f110b684e8a33a7175fc7a7e5989963bf0 /puppet | |
| parent | 831fb49f7de6e89b7b7f7640ebef594c0350af82 (diff) | |
Move deprecated SchedulerHints logic to overcloud.j2.yaml
The changes in puppet/role.role.j2.yaml should have been made
to overcloud.j2.yaml, because we don't want the hard-coded reference
to the deprecated name in the parent template. Note we need to
pass this value from the parent template so the %index% substitution
works, which is required for predictable placement via *SchedulerHints
Partial-Bug: #1711656
Change-Id: Ided1802daac48d737f53caa7093df814ba101dd0
(cherry picked from commit c6207379db07544240b699ba000537b58d9fb68f)
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/role.role.j2.yaml | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index 5453e65c..f58f7409 100644 --- a/puppet/role.role.j2.yaml +++ b/puppet/role.role.j2.yaml @@ -148,12 +148,6 @@ parameters: type: json description: Optional scheduler hints to pass to nova default: {} -{%- if role.deprecated_param_scheduler_hints is defined %} - {{role.deprecated_param_scheduler_hints}}: - type: json - description: DEPRECATED - use {{role.name}}SchedulerHints instead - default: {} -{%- endif %} NodeIndex: type: number default: 0 @@ -239,7 +233,7 @@ parameter_groups: description: Do not use deprecated params, they will be removed. parameters: {%- for property in role %} -{%- if property.startswith('deprecated_param_') %} +{%- if property.startswith('deprecated_param_') and not role[property].endswith('SchedulerHints') %} - {{role[property]}} {%- endif %} {%- endfor %} @@ -317,12 +311,7 @@ resources: {%- endif %} - {get_param: {{role.name}}ServerMetadata} - {get_param: ServiceMetadataSettings} - scheduler_hints: - map_merge: -{%- if role.deprecated_param_scheduler_hints is defined %} - - {get_param: {{role.deprecated_param_scheduler_hints}}} -{%- endif %} - - {get_param: {{role.name}}SchedulerHints} + scheduler_hints: {get_param: {{role.name}}SchedulerHints} deployment_swift_data: if: - deployment_swift_data_map_unset |