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/swift-storage.yaml | |
| parent | e09985682ff8b604558b9e76d483ae9f132a48f9 (diff) | |
| parent | 9a6c24beab3e997e91503b10e49f5deaae77799f (diff) | |
Merge "Remove unneeded net_ip_map dump into hieradata"
Diffstat (limited to 'puppet/swift-storage.yaml')
| -rw-r--r-- | puppet/swift-storage.yaml | 4 |
1 files changed, 0 insertions, 4 deletions
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: |