Move out of roles any Ceph setting
Change-Id: I6ff0f977a1fb2fd55b29becd296ab01c65b50228
This commit is contained in:
parent
95949a2975
commit
d90363bd58
|
@ -231,22 +231,6 @@ resources:
|
|||
server: {get_resource: CephStorage}
|
||||
input_values:
|
||||
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
|
||||
ceph_cluster_network:
|
||||
get_attr:
|
||||
- NetIpMap
|
||||
- net_ip_map
|
||||
- str_replace:
|
||||
template: "NETWORK_subnet"
|
||||
params:
|
||||
NETWORK: {get_param: [ServiceNetMap, CephClusterNetwork]}
|
||||
ceph_public_network:
|
||||
get_attr:
|
||||
- NetIpMap
|
||||
- net_ip_map
|
||||
- str_replace:
|
||||
template: "NETWORK_subnet"
|
||||
params:
|
||||
NETWORK: {get_param: [ServiceNetMap, CephPublicNetwork]}
|
||||
|
||||
CephStorageConfig:
|
||||
type: OS::Heat::StructuredConfig
|
||||
|
@ -261,8 +245,6 @@ resources:
|
|||
- extraconfig
|
||||
- service_names
|
||||
- service_configs
|
||||
- ceph_cluster # provided by CephClusterConfig
|
||||
- ceph
|
||||
- all_nodes # provided by allNodesConfig
|
||||
- '"%{::osfamily}"'
|
||||
merge_behavior: deeper
|
||||
|
@ -282,8 +264,6 @@ resources:
|
|||
ceph:
|
||||
mapped_data:
|
||||
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
|
||||
ceph::profile::params::cluster_network: {get_input: ceph_cluster_network}
|
||||
ceph::profile::params::public_network: {get_input: ceph_public_network}
|
||||
|
||||
# Resource for site-specific injection of root certificate
|
||||
NodeTLSCAData:
|
||||
|
|
|
@ -264,7 +264,6 @@ resources:
|
|||
- service_names
|
||||
- service_configs
|
||||
- compute
|
||||
- ceph_cluster # provided by CephClusterConfig
|
||||
- all_nodes # provided by allNodesConfig
|
||||
- '"%{::osfamily}"'
|
||||
- neutron_bigswitch_data # Optionally provided by ComputeExtraConfigPre
|
||||
|
|
|
@ -494,23 +494,6 @@ resources:
|
|||
redis_vip: {get_param: RedisVirtualIP}
|
||||
sahara_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SaharaApiNetwork]}]}
|
||||
memcached_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MemcachedNetwork]}]}
|
||||
ceph_cluster_network:
|
||||
get_attr:
|
||||
- NetIpMap
|
||||
- net_ip_map
|
||||
- str_replace:
|
||||
template: "NETWORK_subnet"
|
||||
params:
|
||||
NETWORK: {get_param: [ServiceNetMap, CephClusterNetwork]}
|
||||
ceph_public_network:
|
||||
get_attr:
|
||||
- NetIpMap
|
||||
- net_ip_map
|
||||
- str_replace:
|
||||
template: "NETWORK_subnet"
|
||||
params:
|
||||
NETWORK: {get_param: [ServiceNetMap, CephPublicNetwork]}
|
||||
ceph_public_ip: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CephPublicNetwork]}]}
|
||||
ironic_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, IronicApiNetwork]}]}
|
||||
|
||||
# Map heat metadata into hiera datafiles
|
||||
|
@ -529,8 +512,6 @@ resources:
|
|||
- service_names
|
||||
- controller
|
||||
- swift_devices_and_proxy # provided by SwiftDevicesAndProxyConfig
|
||||
- ceph_cluster # provided by CephClusterConfig
|
||||
- ceph
|
||||
- bootstrap_node # provided by BootstrapNodeConfig
|
||||
- all_nodes # provided by allNodesConfig
|
||||
- vip_data # provided by vip-config
|
||||
|
@ -559,11 +540,6 @@ resources:
|
|||
- {get_param: ControllerExtraConfig}
|
||||
extraconfig:
|
||||
mapped_data: {get_param: ExtraConfig}
|
||||
ceph:
|
||||
mapped_data:
|
||||
ceph::profile::params::cluster_network: {get_input: ceph_cluster_network}
|
||||
ceph::profile::params::public_network: {get_input: ceph_public_network}
|
||||
ceph::profile::params::public_addr: {get_input: ceph_public_ip}
|
||||
controller:
|
||||
mapped_data: # data supplied directly to this deployment configuration, etc
|
||||
bootstack_nodeid: {get_input: bootstack_nodeid}
|
||||
|
|
|
@ -77,6 +77,22 @@ outputs:
|
|||
ceph::profile::params::manage_repo: false
|
||||
ceph::profile::params::authentication_type: cephx
|
||||
ceph::profile::params::fsid: {get_param: CephClusterFSID}
|
||||
# NOTE: bind IP is found in Heat replacing the network name with the local node IP
|
||||
# for the given network; replacement examples (eg. for internal_api):
|
||||
# internal_api -> IP
|
||||
# internal_api_uri -> [IP]
|
||||
# internal_api_subnet - > IP/CIDR
|
||||
ceph::profile::params::cluster_network:
|
||||
str_replace:
|
||||
template: "NETWORK_subnet"
|
||||
params:
|
||||
NETWORK: {get_param: [ServiceNetMap, CephClusterNetwork]}
|
||||
ceph::profile::params::public_network:
|
||||
str_replace:
|
||||
template: "NETWORK_subnet"
|
||||
params:
|
||||
NETWORK: {get_param: [ServiceNetMap, CephPublicNetwork]}
|
||||
ceph::profile::params::public_addr: {get_param: [ServiceNetMap, CephPublicNetwork]}
|
||||
ceph::profile::params::client_keys:
|
||||
str_replace:
|
||||
template: "{
|
||||
|
|
Loading…
Reference in New Issue