Merge "Set cinder::api::bind_host within service template"
This commit is contained in:
commit
a95e4c2afe
|
@ -234,18 +234,6 @@ resources:
|
|||
input_values:
|
||||
snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
|
||||
snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
|
||||
cinder_iscsi_ip_address:
|
||||
str_replace:
|
||||
template: "'IP'"
|
||||
params:
|
||||
IP:
|
||||
get_attr:
|
||||
- NetIpMap
|
||||
- net_ip_map
|
||||
- str_replace:
|
||||
template: "NETWORK_uri"
|
||||
params:
|
||||
NETWORK: {get_param: [ServiceNetMap, CinderIscsiNetwork]}
|
||||
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
|
||||
|
||||
# Map heat metadata into hiera datafiles
|
||||
|
@ -281,8 +269,6 @@ resources:
|
|||
mapped_data: {get_param: ExtraConfig}
|
||||
volume:
|
||||
mapped_data:
|
||||
# Cinder
|
||||
tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_ip_address: {get_input: cinder_iscsi_ip_address}
|
||||
tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
|
||||
snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
|
||||
snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}
|
||||
|
|
|
@ -536,19 +536,6 @@ resources:
|
|||
enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
|
||||
swift_proxy_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftProxyNetwork]}]}
|
||||
swift_management_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, SwiftMgmtNetwork]}]}
|
||||
cinder_iscsi_network:
|
||||
str_replace:
|
||||
template: "'IP'"
|
||||
params:
|
||||
IP:
|
||||
get_attr:
|
||||
- NetIpMap
|
||||
- net_ip_map
|
||||
- str_replace:
|
||||
template: "NETWORK_uri"
|
||||
params:
|
||||
NETWORK: {get_param: [ServiceNetMap, CinderIscsiNetwork]}
|
||||
cinder_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, CinderApiNetwork]}]}
|
||||
glance_api_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
|
||||
glance_registry_network: {get_attr: [NetIpMap, net_ip_map, {get_param: [ServiceNetMap, GlanceRegistryNetwork]}]}
|
||||
glance_api_servers: { get_param: [EndpointMap, GlanceInternal, uri]}
|
||||
|
@ -671,10 +658,6 @@ resources:
|
|||
swift::storage::all::storage_local_net_ip: {get_input: swift_management_network}
|
||||
swift::swift_hash_path_suffix: {get_input: swift_hash_suffix}
|
||||
|
||||
# Cinder
|
||||
tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_address: {get_input: cinder_iscsi_network}
|
||||
cinder::api::bind_host: {get_input: cinder_api_network}
|
||||
|
||||
# Glance
|
||||
glance::api::bind_host: {get_input: glance_api_network}
|
||||
glance::registry::bind_host: {get_input: glance_registry_network}
|
||||
|
|
|
@ -78,5 +78,11 @@ outputs:
|
|||
dport:
|
||||
- 8776
|
||||
- 13776
|
||||
# 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
|
||||
cinder::api::bind_host: {get_param: [ServiceNetMap, CinderApiNetwork]}
|
||||
step_config: |
|
||||
include ::tripleo::profile::base::cinder::api
|
||||
|
|
|
@ -90,5 +90,15 @@ outputs:
|
|||
tripleo.cinder_volume.firewall_rules:
|
||||
'120 iscsi initiator':
|
||||
dport: 3260
|
||||
# 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
|
||||
tripleo::profile::base::cinder::volume::iscsi::cinder_iscsi_address:
|
||||
str_replace:
|
||||
template: "NETWORK_uri"
|
||||
params:
|
||||
NETWORK: {get_param: [ServiceNetMap, CinderIscsiNetwork]}
|
||||
step_config: |
|
||||
include ::tripleo::profile::base::cinder::volume
|
||||
|
|
Loading…
Reference in New Issue