Merge "Wire in hieradata overrides via ExtraConfig for CephStorage"
This commit is contained in:
commit
f00e08cbfd
|
@ -42,6 +42,18 @@ parameters:
|
||||||
Hostname:
|
Hostname:
|
||||||
type: string
|
type: string
|
||||||
default: '' # Defaults to Heat created hostname
|
default: '' # Defaults to Heat created hostname
|
||||||
|
ExtraConfig:
|
||||||
|
default: {}
|
||||||
|
description: |
|
||||||
|
Additional configuration to inject into the cluster. Note
|
||||||
|
that CephStorageExtraConfig takes precedence over ExtraConfig.
|
||||||
|
type: json
|
||||||
|
CephStorageExtraConfig:
|
||||||
|
default: {}
|
||||||
|
description: |
|
||||||
|
Role specific additional configuration to inject into the cluster.
|
||||||
|
type: json
|
||||||
|
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
CephStorage:
|
CephStorage:
|
||||||
|
|
|
@ -597,6 +597,12 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
constraints:
|
constraints:
|
||||||
- custom_constraint: nova.flavor
|
- custom_constraint: nova.flavor
|
||||||
|
CephStorageExtraConfig:
|
||||||
|
default: {}
|
||||||
|
description: |
|
||||||
|
CephStorage specific configuration to inject into the cluster. Same
|
||||||
|
structure as ExtraConfig.
|
||||||
|
type: json
|
||||||
|
|
||||||
# Hostname format for each role
|
# Hostname format for each role
|
||||||
# Note %index% is translated into the index of the node, e.g 0/1/2 etc
|
# Note %index% is translated into the index of the node, e.g 0/1/2 etc
|
||||||
|
@ -940,6 +946,8 @@ resources:
|
||||||
template: {get_param: CephStorageHostnameFormat}
|
template: {get_param: CephStorageHostnameFormat}
|
||||||
params:
|
params:
|
||||||
'%stackname%': {get_param: 'OS::stack_name'}
|
'%stackname%': {get_param: 'OS::stack_name'}
|
||||||
|
ExtraConfig: {get_param: ExtraConfig}
|
||||||
|
CephStorageExtraConfig: {get_param: CephStorageExtraConfig}
|
||||||
|
|
||||||
ControllerIpListMap:
|
ControllerIpListMap:
|
||||||
type: OS::TripleO::Network::Ports::NetIpListMap
|
type: OS::TripleO::Network::Ports::NetIpListMap
|
||||||
|
|
|
@ -42,6 +42,18 @@ parameters:
|
||||||
Hostname:
|
Hostname:
|
||||||
type: string
|
type: string
|
||||||
default: '' # Defaults to Heat created hostname
|
default: '' # Defaults to Heat created hostname
|
||||||
|
ExtraConfig:
|
||||||
|
default: {}
|
||||||
|
description: |
|
||||||
|
Additional hiera configuration to inject into the cluster. Note
|
||||||
|
that CephStorageExtraConfig takes precedence over ExtraConfig.
|
||||||
|
type: json
|
||||||
|
CephStorageExtraConfig:
|
||||||
|
default: {}
|
||||||
|
description: |
|
||||||
|
Role specific additional hiera configuration to inject into the cluster.
|
||||||
|
type: json
|
||||||
|
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
CephStorage:
|
CephStorage:
|
||||||
|
@ -118,6 +130,8 @@ resources:
|
||||||
hiera:
|
hiera:
|
||||||
hierarchy:
|
hierarchy:
|
||||||
- heat_config_%{::deploy_config_name}
|
- heat_config_%{::deploy_config_name}
|
||||||
|
- ceph_extraconfig
|
||||||
|
- extraconfig
|
||||||
- ceph_cluster # provided by CephClusterConfig
|
- ceph_cluster # provided by CephClusterConfig
|
||||||
- ceph
|
- ceph
|
||||||
- '"%{::osfamily}"'
|
- '"%{::osfamily}"'
|
||||||
|
@ -125,6 +139,10 @@ resources:
|
||||||
datafiles:
|
datafiles:
|
||||||
common:
|
common:
|
||||||
raw_data: {get_file: hieradata/common.yaml}
|
raw_data: {get_file: hieradata/common.yaml}
|
||||||
|
ceph_extraconfig:
|
||||||
|
mapped_data: {get_param: CephStorageExtraConfig}
|
||||||
|
extraconfig:
|
||||||
|
mapped_data: {get_param: ExtraConfig}
|
||||||
ceph:
|
ceph:
|
||||||
raw_data: {get_file: hieradata/ceph.yaml}
|
raw_data: {get_file: hieradata/ceph.yaml}
|
||||||
mapped_data:
|
mapped_data:
|
||||||
|
|
Loading…
Reference in New Issue