Fix ControllerExtraConfig parameter name

We've had a typo for a while that a parameter is named
"controllerExtraConfig" with lowercase c, which can be quite confusing
for users because the other similar parameters
(e.g. NovaComputeExtraConfig) consistently start with an upper case
letter.

We'll support both variants from now on, marking the typoed variant as
deprecated.

Change-Id: Ic67a4297e7fa08308889b95ba35389a01f70f5a4

2 files changed, 24 insertions, 5 deletions

diff --git a/overcloud.yaml b/overcloud.yaml
index 20c853cd..2b0666b0 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -393,8 +393,7 @@ parameters:
   controllerExtraConfig:
     default: {}
     description: |
-      Controller specific configuration to inject into the cluster. Same
-      structure as ExtraConfig.
+      Deprecated. Use ControllerExtraConfig via parameter_defaults instead.
     type: json
   controllerImage:
     type: string
@@ -852,6 +851,12 @@ parameters:
       List of resources to be removed from CephStorageResourceGroup when
       doing an update which requires removal of specific resources.
 
+parameter_groups:
+- label: deprecated
+  description: Do not use deprecated params, they will be removed.
+  parameters:
+  - controllerExtraConfig
+
 
 resources:
 
@@ -920,7 +925,7 @@ resources:
           CinderEnableRbdBackend: {get_param: CinderEnableRbdBackend}
           CloudDomain: {get_param: CloudDomain}
           ControlVirtualInterface: {get_param: ControlVirtualInterface}
-          ControllerExtraConfig: {get_param: controllerExtraConfig}
+          controllerExtraConfig: {get_param: controllerExtraConfig}
           CorosyncIPv6: {get_param: CorosyncIPv6}
           Debug: {get_param: Debug}
           EnableFencing: {get_param: EnableFencing}
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 56eb8b96..a0ed5c91 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-10-15
+heat_template_version: 2016-04-08
 
 description: >
   OpenStack controller node configured by Puppet.
@@ -97,6 +97,11 @@ parameters:
     default: 0
     description: Number of workers for Cinder service.
     type: number
+  controllerExtraConfig:
+    default: {}
+    description: |
+      Deprecated. Use ControllerExtraConfig via parameter_defaults instead.
+    type: json
   ControllerExtraConfig:
     default: {}
     description: |
@@ -762,6 +767,12 @@ parameters:
     type: json
     default: {}
 
+parameter_groups:
+- label: deprecated
+  description: Do not use deprecated params, they will be removed.
+  parameters:
+  - controllerExtraConfig
+
 resources:
 
   Controller:
@@ -1284,7 +1295,10 @@ resources:
             service_configs:
               mapped_data: {get_param: ServiceConfigSettings}
             controller_extraconfig:
-              mapped_data: {get_param: ControllerExtraConfig}
+              mapped_data:
+                map_merge:
+                  - {get_param: controllerExtraConfig}
+                  - {get_param: ControllerExtraConfig}
             extraconfig:
               mapped_data: {get_param: ExtraConfig}
             common: