Merge "Remove deprecated net_ip_subnet_map output"
This commit is contained in:
commit
0f45642dd6
|
@ -101,24 +101,6 @@ outputs:
|
|||
storage_mgmt_uri: {get_param: StorageMgmtIpUri}
|
||||
tenant_uri: {get_param: TenantIpUri}
|
||||
management_uri: {get_param: ManagementIpUri}
|
||||
# net_ip_subnet_map is deprecated, please use *subnet from net_ip_map
|
||||
net_ip_subnet_map:
|
||||
description: >
|
||||
A Hash containing a mapping of network names to assigned IPs/CIDR
|
||||
for a specific machine.
|
||||
value:
|
||||
ctlplane:
|
||||
list_join:
|
||||
- ''
|
||||
- - {get_param: ControlPlaneIp}
|
||||
- '/'
|
||||
- {get_param: ControlPlaneSubnetCidr}
|
||||
external: {get_param: ExternalIpSubnet}
|
||||
internal_api: {get_param: InternalApiIpSubnet}
|
||||
storage: {get_param: StorageIpSubnet}
|
||||
storage_mgmt: {get_param: StorageMgmtIpSubnet}
|
||||
tenant: {get_param: TenantIpSubnet}
|
||||
management: {get_param: ManagementIpSubnet}
|
||||
# net_ip_uri_map is deprecated, please use *uri from net_ip_map
|
||||
net_ip_uri_map:
|
||||
description: >
|
||||
|
|
|
@ -236,8 +236,22 @@ resources:
|
|||
input_values:
|
||||
enable_package_install: {get_param: EnablePackageInstall}
|
||||
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
|
||||
ceph_cluster_network: {get_attr: [NetIpMap, net_ip_subnet_map, {get_param: [ServiceNetMap, CephClusterNetwork]}]}
|
||||
ceph_public_network: {get_attr: [NetIpMap, net_ip_subnet_map, {get_param: [ServiceNetMap, CephPublicNetwork]}]}
|
||||
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
|
||||
|
@ -270,7 +284,6 @@ resources:
|
|||
network:
|
||||
mapped_data:
|
||||
net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
|
||||
net_ip_subnet_map: {get_attr: [NetIpMap, net_ip_subnet_map]}
|
||||
net_ip_uri_map: {get_attr: [NetIpMap, net_ip_uri_map]}
|
||||
ceph_extraconfig:
|
||||
mapped_data: {get_param: CephStorageExtraConfig}
|
||||
|
|
|
@ -277,7 +277,6 @@ resources:
|
|||
network:
|
||||
mapped_data:
|
||||
net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
|
||||
net_ip_subnet_map: {get_attr: [NetIpMap, net_ip_subnet_map]}
|
||||
net_ip_uri_map: {get_attr: [NetIpMap, net_ip_uri_map]}
|
||||
volume_extraconfig:
|
||||
mapped_data: {get_param: BlockStorageExtraConfig}
|
||||
|
|
|
@ -294,7 +294,6 @@ resources:
|
|||
network:
|
||||
mapped_data:
|
||||
net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
|
||||
net_ip_subnet_map: {get_attr: [NetIpMap, net_ip_subnet_map]}
|
||||
net_ip_uri_map: {get_attr: [NetIpMap, net_ip_uri_map]}
|
||||
compute:
|
||||
mapped_data:
|
||||
|
|
|
@ -567,7 +567,14 @@ resources:
|
|||
str_replace:
|
||||
template: "['SUBNET']"
|
||||
params:
|
||||
SUBNET: {get_attr: [NetIpMap, net_ip_subnet_map, {get_param: [ServiceNetMap, HorizonNetwork]}]}
|
||||
SUBNET:
|
||||
get_attr:
|
||||
- NetIpMap
|
||||
- net_ip_map
|
||||
- str_replace:
|
||||
template: "NETWORK_subnet"
|
||||
params:
|
||||
NETWORK: {get_param: [ServiceNetMap, HorizonNetwork]}
|
||||
rabbitmq_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, RabbitmqNetwork]}]}
|
||||
redis_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, RedisNetwork]}]}
|
||||
redis_vip: {get_param: RedisVirtualIP}
|
||||
|
@ -575,8 +582,22 @@ resources:
|
|||
memcached_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MemcachedNetwork]}]}
|
||||
mysql_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, MysqlNetwork]}]}
|
||||
mysql_virtual_ip: {get_param: MysqlVirtualIP}
|
||||
ceph_cluster_network: {get_attr: [NetIpMap, net_ip_subnet_map, {get_param: [ServiceNetMap, CephClusterNetwork]}]}
|
||||
ceph_public_network: {get_attr: [NetIpMap, net_ip_subnet_map, {get_param: [ServiceNetMap, CephPublicNetwork]}]}
|
||||
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]}]}
|
||||
|
||||
|
@ -630,7 +651,6 @@ resources:
|
|||
network:
|
||||
mapped_data:
|
||||
net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
|
||||
net_ip_subnet_map: {get_attr: [NetIpMap, net_ip_subnet_map]}
|
||||
net_ip_uri_map: {get_attr: [NetIpMap, net_ip_uri_map]}
|
||||
ceph:
|
||||
mapped_data:
|
||||
|
|
|
@ -264,7 +264,6 @@ resources:
|
|||
network:
|
||||
mapped_data:
|
||||
net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
|
||||
net_ip_subnet_map: {get_attr: [NetIpMap, net_ip_subnet_map]}
|
||||
net_ip_uri_map: {get_attr: [NetIpMap, net_ip_uri_map]}
|
||||
object_extraconfig:
|
||||
mapped_data: {get_param: ObjectStorageExtraConfig}
|
||||
|
|
Loading…
Reference in New Issue