Merge "Ironic: enable iPXE by default and make it configurable"

[apex-tripleo-heat-templates.git] / puppet / swift-devices-and-proxy-config.yaml

diff --git a/puppet/swift-devices-and-proxy-config.yaml b/puppet/swift-devices-and-proxy-config.yaml
index 731f69a..afee4da 100644 (file)
--- a/puppet/swift-devices-and-proxy-config.yaml
+++ b/puppet/swift-devices-and-proxy-config.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'Swift Devices and Proxy Config for Puppet'
 
 parameters:
@@ -6,8 +6,6 @@ parameters:
     type: comma_delimited_list
   object_store_swift_devices:
     type: comma_delimited_list
-  controller_swift_proxy_memcaches:
-    type: comma_delimited_list
 
 resources:
 
@@ -20,7 +18,7 @@ resources:
           datafiles:
             swift_devices_and_proxy:
               mapped_data:
-                tripleo::ringbuilder::devices:
+                tripleo::profile::base::swift::ringbuilder::devices:
                   list_join:
                   - ", "
                   - - list_join:
@@ -29,14 +27,6 @@ resources:
                     - list_join:
                       - ", "
                       - {get_param: object_store_swift_devices}
-                swift::proxy::cache::memcache_servers:
-                  str_replace:
-                    template: "['SERVERS_LIST']"
-                    params:
-                      SERVERS_LIST:
-                        list_join:
-                        - "','"
-                        - {get_param: controller_swift_proxy_memcaches}
 
 outputs:
   config_id: