diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-08-17 09:17:05 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-08-17 09:17:05 +0000 |
| commit | 5c609f7c78bee71985120cd15ffbe2d6f2d548a4 (patch) | |
| tree | 8ae689a58c7f50ca8f3512ccb3ad63fdd98ca67a /puppet | |
| parent | e09985682ff8b604558b9e76d483ae9f132a48f9 (diff) | |
| parent | 9a6c24beab3e997e91503b10e49f5deaae77799f (diff) | |
Merge "Remove unneeded net_ip_map dump into hieradata"
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/ceph-storage.yaml | 4 | ||||
| -rw-r--r-- | puppet/cinder-storage.yaml | 4 | ||||
| -rw-r--r-- | puppet/compute.yaml | 4 | ||||
| -rw-r--r-- | puppet/controller.yaml | 4 | ||||
| -rw-r--r-- | puppet/swift-storage.yaml | 4 |
5 files changed, 0 insertions, 20 deletions
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml index 8fa9fd8f..659f2a67 100644 --- 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 0bde8aca..30609f3d 100644 --- 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 489421bf..bd2eee18 100644 --- a/puppet/compute.yaml +++ b/puppet/compute.yaml @@ -271,7 +271,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 @@ -291,9 +290,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: nova_api_host: {get_input: nova_api_host} diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 9c8d7570..801b99ba 100644 --- 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 f2ea3939..e55199c2 100644 --- 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: |