openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Remove unneeded net_ip_map dump into hieradata 

We will lookup bind addresses using map_replace within the templates
so dumping net_ip_map as hieradata is unneeded.

Change-Id: If54c9033fc58d2cfaa040e30adeed7f58e44fd88
This commit is contained in:
Giulio Fidente 2016-08-11 22:56:26 +02:00
parent 80e82be09b
commit 9a6c24beab
5 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
puppet/ceph-storage.yaml
View File

@ -270,7 +270,6 @@ resources:
- ceph
- all_nodes # provided by allNodesConfig
- '"%{::osfamily}"'
- network
merge_behavior: deeper
datafiles:
service_names:
@ -281,9 +280,6 @@ resources:
map_replace:
- {get_param: ServiceConfigSettings}
- values: {get_attr: [NetIpMap, net_ip_map]}
network:
mapped_data:
net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
ceph_extraconfig:
mapped_data: {get_param: CephStorageExtraConfig}
extraconfig:

4
puppet/cinder-storage.yaml
View File

@ -270,7 +270,6 @@ resources:
- volume
- all_nodes # provided by allNodesConfig
- '"%{::osfamily}"'
- network
merge_behavior: deeper
datafiles:
service_names:
@ -281,9 +280,6 @@ resources:
map_replace:
- {get_param: ServiceConfigSettings}
- values: {get_attr: [NetIpMap, net_ip_map]}
network:
mapped_data:
net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
volume_extraconfig:
mapped_data: {get_param: BlockStorageExtraConfig}
extraconfig:

4
puppet/compute.yaml
View File

@ -369,7 +369,6 @@ resources:
- ceph_cluster # provided by CephClusterConfig
- all_nodes # provided by allNodesConfig
- '"%{::osfamily}"'
- network
- neutron_bigswitch_data # Optionally provided by ComputeExtraConfigPre
- cisco_n1kv_data # Optionally provided by ComputeExtraConfigPre
- nova_nuage_data # Optionally provided by ComputeExtraConfigPre
@ -389,9 +388,6 @@ resources:
mapped_data: {get_param: NovaComputeExtraConfig}
extraconfig:
mapped_data: {get_param: ExtraConfig}
network:
mapped_data:
net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
compute:
mapped_data:
cinder_enable_nfs_backend: {get_input: cinder_enable_nfs_backend}

4
puppet/controller.yaml
View File

@ -630,7 +630,6 @@ resources:
- all_nodes # provided by allNodesConfig
- vip_data # provided by vip-config
- '"%{::osfamily}"'
- network
- cinder_dellsc_data # Optionally provided by ControllerExtraConfigPre
- cinder_netapp_data # Optionally provided by ControllerExtraConfigPre
- cinder_eqlx_data # Optionally provided by ControllerExtraConfigPre
@ -655,9 +654,6 @@ resources:
- {get_param: ControllerExtraConfig}
extraconfig:
mapped_data: {get_param: ExtraConfig}
network:
mapped_data:
net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
ceph:
mapped_data:
ceph::profile::params::cluster_network: {get_input: ceph_cluster_network}

4
puppet/swift-storage.yaml
View File

@ -250,7 +250,6 @@ resources:
- swift_devices_and_proxy # provided by SwiftDevicesAndProxyConfig
- all_nodes # provided by allNodesConfig
- '"%{::osfamily}"'
- network
merge_behavior: deeper
datafiles:
service_names:
@ -261,9 +260,6 @@ resources:
map_replace:
- {get_param: ServiceConfigSettings}
- values: {get_attr: [NetIpMap, net_ip_map]}
network:
mapped_data:
net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
object_extraconfig:
mapped_data: {get_param: ObjectStorageExtraConfig}
extraconfig: