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

diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index 8fa9fd8..659f2a6 100644 (file)
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@ -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:

diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index 0bde8ac..30609f3 100644 (file)
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -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:

diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index 8de9370..f8aef35 100644 (file)
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -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}

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 9c8d757..801b99b 100644 (file)
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -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}

diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index f2ea393..e55199c 100644 (file)
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -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: