aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-09 16:00:51 +0000
committerGerrit Code Review <review@openstack.org>2016-09-09 16:00:51 +0000
commit5fa62815675912b57775c36b7b184ddbfcaa1753 (patch)
tree4c10fa0ef4138a57f102d338d4fb1cb6cd50df78
parent57d0840fcca4694358da81d4472c0e329f01074a (diff)
parent4b55a18a1c213d02f801cda1b121561c3eb69077 (diff)
Merge "Remove *ExtraConfig parameters from overcloud.yaml"
-rw-r--r--overcloud.yaml43
1 files changed, 0 insertions, 43 deletions
diff --git a/overcloud.yaml b/overcloud.yaml
index 3d18214c..604a7696 100644
--- 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%'