Merge "Add hieradata for Manila v1 and v2 endpoints"

[apex-tripleo-heat-templates.git] / puppet / swift-storage.yaml

diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index 3f8e1ce..3553f77 100644 (file)
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2015-04-30
+heat_template_version: 2016-10-14
 description: 'OpenStack swift storage node configured by Puppet'
 parameters:
   OvercloudSwiftStorageFlavor:
@@ -251,7 +251,6 @@ resources:
             - swift_devices_and_proxy # provided by SwiftDevicesAndProxyConfig
             - all_nodes # provided by allNodesConfig
             - '"%{::osfamily}"'
-            - common
             - network
           merge_behavior: deeper
           datafiles:
@@ -259,9 +258,10 @@ resources:
               mapped_data:
                 service_names: {get_param: ServiceNames}
             service_configs:
-              mapped_data: {get_param: ServiceConfigSettings}
-            common:
-              raw_data: {get_file: hieradata/common.yaml}
+              mapped_data:
+                map_replace:
+                  - {get_param: ServiceConfigSettings}
+                  - values: {get_attr: [NetIpMap, net_ip_map]}
             network:
               mapped_data:
                 net_ip_map: {get_attr: [NetIpMap, net_ip_map]}
@@ -272,7 +272,6 @@ resources:
             extraconfig:
               mapped_data: {get_param: ExtraConfig}
             object:
-              raw_data: {get_file: hieradata/object.yaml}
               mapped_data: # data supplied directly to this deployment configuration, etc
                 swift::swift_hash_path_suffix: { get_input: swift_hash_suffix }
                 swift::storage::all::storage_local_net_ip: {get_input: swift_management_network}