aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud.j2.yaml
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2017-07-17 10:15:13 +0200
committerGiulio Fidente <gfidente@redhat.com>2017-07-17 11:54:54 +0200
commit68e582323e8d02638b31575f1c6aa40380cb1d0f (patch)
treee269f8bb3132980f475f2dd41bf88c22f224b896 /overcloud.j2.yaml
parent8b81b363fd48b0080b963fd2b1ab6bfe97b0c204 (diff)
Handles {controller,NovaCompute}ExtraConfig deprecation in ovecloud.j2
We missed to parse and merge {controller,NovaCompute}ExtraConfig data in change [1]. Also fixes whitespaces handling in docker-steps.j2 and puppet-steps.j2 previously updated by [2]. 1. Id37de5864138edd5476c097a8a1f0763faeaf768 2. I36a642fbc2076ad9e4a10ffc56d6d16f3ed6f27a Change-Id: Ia9983bc991eb79e479855993c1c8819ddfb52e38
Diffstat (limited to 'overcloud.j2.yaml')
-rw-r--r--overcloud.j2.yaml32
1 files changed, 29 insertions, 3 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml
index f18a053..ddf2701 100644
--- a/overcloud.j2.yaml
+++ b/overcloud.j2.yaml
@@ -60,13 +60,23 @@ parameters:
description: |
Additional hiera configuration to inject into the cluster.
type: json
-{% for role in roles %}
+{%- for role in roles %}
{{role.name}}ExtraConfig:
default: {}
description: |
Role specific additional hiera configuration to inject into the cluster.
type: json
-{% endfor %}
+{%- endfor %}
+ controllerExtraConfig:
+ default: {}
+ description: |
+ DEPRECATED use ControllerExtraConfig instead
+ type: json
+ NovaComputeExtraConfig:
+ default: {}
+ description: |
+ DEPRECATED use ComputeExtraConfig instead
+ type: json
InternalApiVirtualFixedIPs:
default: []
description: >
@@ -166,7 +176,6 @@ parameters:
{% else %}
default: "%stackname%-{{role.name.lower()}}-%index%"
{% endif %}
-
{{role.name}}RemovalPolicies:
default: []
type: json
@@ -215,6 +224,13 @@ parameters:
description: >
List of server hostnames to blacklist from any triggered deployments.
+parameter_groups:
+- label: deprecated
+ description: Do not use deprecated params, they will be removed.
+ parameters:
+ - controllerExtraConfig
+ - NovaComputeExtraConfig
+
conditions:
add_vips_to_etc_hosts: {equals : [{get_param: AddVipsToEtcHosts}, True]}
@@ -373,7 +389,17 @@ 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 %}
- 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