diff options
| author |   Steven Hardy <shardy@redhat.com> | 2017-08-23 11:23:10 +0100 |
|---|---|---|
| committer |   Alex Schultz <aschultz@redhat.com> | 2017-09-01 23:57:16 +0000 |
| commit | 878d236f7bd1aaa214acd37a74477c109ba756f2 (patch) | |
| tree | e5ebadb22185efd0e65be6de30dc0606cce4643b | |
| parent | d875f79dab32bca11016234ea135a206688f793e (diff) | |
Fix hardcoded references to deprecated *ExtraConfig parameters
These were missed in the previous refactor in role.role.j2.yaml,
we shouldn't reference these via hard-coded values or they become
mandatory in the roles_data.yaml
Change-Id: I014e7d6679c5733b17243d647eaad228c276585a
Closes-Bug: #1711656
(cherry picked from commit 4a4f6783081d9c5b74cda5149bef7655102fcfd8)
| -rw-r--r-- | overcloud.j2.yaml | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index 2514f809..d621244e 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -70,17 +70,14 @@ parameters: description: | Role specific additional hiera configuration to inject into the cluster. type: json -{%- endfor %} - controllerExtraConfig: - default: {} - description: | - DEPRECATED use ControllerExtraConfig instead - type: json - NovaComputeExtraConfig: +{%- if role.deprecated_param_extraconfig is defined %} + {{role.deprecated_param_extraconfig}}: default: {} description: | - DEPRECATED use ComputeExtraConfig instead + DEPRECATED use {{role.name}}ExtraConfig instead type: json +{%- endif %} +{%- endfor %} NeutronControlPlaneID: default: 'ctlplane' type: string @@ -231,7 +228,7 @@ parameters: List of server hostnames to blacklist from any triggered deployments. {% for role in roles %} -{%- if role.deprecated_param_scheduler_hints is defined %} +{%- if role.deprecated_param_scheduler_hints is defined or role.deprecated_param_extraconfig is defined %} {%- if not parameter_groups_defined|default(false) %} parameter_groups: - label: deprecated @@ -239,8 +236,13 @@ parameter_groups: parameters: {%- set parameter_groups_defined = true %} {%- endif %} +{%- endif %} +{%- if role.deprecated_param_scheduler_hints is defined %} - {{role.deprecated_param_scheduler_hints}} {%- endif %} +{%- if role.deprecated_param_extraconfig is defined %} + - {{role.deprecated_param_extraconfig}} +{%- endif %} {%- endfor %} conditions: @@ -421,17 +423,10 @@ resources: map_merge: - get_attr: [{{role.name}}ServiceConfigSettings, value] - get_param: ExtraConfig - {%- if role.name == 'Controller' %} - - map_merge: - - get_param: controllerExtraConfig - - get_param: {{role.name}}ExtraConfig - {%- elif role.name == 'Compute' %} - - map_merge: - - get_param: NovaComputeExtraConfig - - get_param: {{role.name}}ExtraConfig - {%- else %} +{%- if role.deprecated_param_extraconfig is defined %} + - get_param: {{role.deprecated_param_extraconfig}} +{%- endif %} - get_param: {{role.name}}ExtraConfig - {%- endif %} # Filter any null/None service_names which may be present due to mapping # of services to OS::Heat::None |