diff options
author | 2016-04-29 16:31:51 +0000 | |
---|---|---|
committer | 2016-04-29 16:31:51 +0000 | |
commit | 65953f6833b24b14d398ab525d8f4013fd64c0c1 (patch) | |
tree | a68d214f938ba28e7f8d441a560d5ae3b99e4b4e /puppet | |
parent | 51dbad07eab3c601d9d6d9ede6f6613ba27c5977 (diff) | |
parent | dbd88344d843e5783a4714c6a670af004a425c95 (diff) |
Merge "Fix ControllerExtraConfig parameter name"
Diffstat (limited to 'puppet')
-rw-r--r-- | puppet/controller.yaml | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 04ce1c34..bf196d24 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: | @@ -709,6 +714,12 @@ parameters: type: json default: {} +parameter_groups: +- label: deprecated + description: Do not use deprecated params, they will be removed. + parameters: + - controllerExtraConfig + resources: Controller: @@ -1218,7 +1229,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: |