diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-09-01 08:52:57 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-09-01 08:52:57 +0000 |
| commit | 4dfc5c933f4e6c2438f027c134730796651a7c9e (patch) | |
| tree | 43ad4a95a834d19c2aa3ab5fa039679ee4705175 /puppet | |
| parent | b18c773dd7c1f2b945587f64d5e97c35ba898399 (diff) | |
| parent | af7146888bfc8888bf1086d8a23c36d32130ae10 (diff) | |
Merge "Move deprecated SchedulerHints logic to overcloud.j2.yaml" into stable/pike
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 |