Remove *ExtraConfig parameters from overcloud.yaml

These per-role parameters are already handled inside the role templates

Change-Id: Ie71c8670ea427ea9c7d94680cff143ad9d524b7a
Partially-Implements: blueprint custom-roles

diff --git a/overcloud.yaml b/overcloud.yaml
index 3d18214..604a769 100644 (file)
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -103,18 +103,6 @@ parameters:
   ControllerCount:
     type: number
     default: 1
-  controllerExtraConfig:
-    default: {}
-    description: |
-      Deprecated. Use ControllerExtraConfig via parameter_defaults instead.
-    type: json
-  ExtraConfig:
-    default: {}
-    description: |
-      Additional configuration to inject into the cluster. The format required
-      may be implementation specific, e.g puppet hieradata.  Any role specific
-      ExtraConfig, e.g controllerExtraConfig takes precedence over ExtraConfig.
-    type: json
 
 # Compute-specific params
   ComputeCount:
@@ -237,12 +225,6 @@ parameters:
   BlockStorageCount:
     type: number
     default: 0
-  BlockStorageExtraConfig:
-    default: {}
-    description: |
-      BlockStorage specific configuration to inject into the cluster. Same
-      structure as ExtraConfig.
-    type: json
   BlockStorageServices:
     default:
       - OS::TripleO::Services::CACerts
@@ -264,12 +246,6 @@ parameters:
   ObjectStorageCount:
     type: number
     default: 0
-  ObjectStorageExtraConfig:
-    default: {}
-    description: |
-      ObjectStorage specific configuration to inject into the cluster. Same
-      structure as ExtraConfig.
-    type: json
   ObjectStorageServices:
     default:
       - OS::TripleO::Services::CACerts
@@ -294,12 +270,6 @@ parameters:
   CephStorageCount:
     type: number
     default: 0
-  CephStorageExtraConfig:
-    default: {}
-    description: |
-      CephStorage specific configuration to inject into the cluster. Same
-      structure as ExtraConfig.
-    type: json
   CephStorageServices:
     default:
       - OS::TripleO::Services::CACerts
@@ -389,12 +359,6 @@ 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:
 
@@ -444,7 +408,6 @@ resources:
         type: OS::TripleO::Controller
         properties:
           CloudDomain: {get_param: CloudDomain}
-          controllerExtraConfig: {get_param: controllerExtraConfig}
           ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
           EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
           Hostname:
@@ -528,8 +491,6 @@ resources:
               params:
                 '%stackname%': {get_param: 'OS::stack_name'}
           ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map]}
-          ExtraConfig: {get_param: ExtraConfig}
-          BlockStorageExtraConfig: {get_param: BlockStorageExtraConfig}
           CloudDomain: {get_param: CloudDomain}
           ServerMetadata: {get_param: ServerMetadata}
           NodeIndex: '%index%'
@@ -568,8 +529,6 @@ resources:
               template: {get_param: ObjectStorageHostnameFormat}
               params:
                 '%stackname%': {get_param: 'OS::stack_name'}
-          ExtraConfig: {get_param: ExtraConfig}
-          ObjectStorageExtraConfig: {get_param: ObjectStorageExtraConfig}
           CloudDomain: {get_param: CloudDomain}
           ServerMetadata: {get_param: ServerMetadata}
           NodeIndex: '%index%'
@@ -608,8 +567,6 @@ resources:
               template: {get_param: CephStorageHostnameFormat}
               params:
                 '%stackname%': {get_param: 'OS::stack_name'}
-          ExtraConfig: {get_param: ExtraConfig}
-          CephStorageExtraConfig: {get_param: CephStorageExtraConfig}
           CloudDomain: {get_param: CloudDomain}
           ServerMetadata: {get_param: ServerMetadata}
           NodeIndex: '%index%'