Overcloud: bump HOT version to 2015-04-30

This patch bumps the HOT version for the overcloud
to Kilo 2015-04-30. We should have already done this
since we are making use of OS::stack_id (a kilo feature)
in some of the nested stacks. Also, this will give us access to
the new repeat function as well.

Change-Id: Ic534e5aeb03bd53296dc4d98c2ac5971464d7fe4

41 files changed, 41 insertions, 41 deletions

diff --git a/all-nodes-config.yaml b/all-nodes-config.yaml
index 7fa27c5d..9687dafc 100644
--- a/all-nodes-config.yaml
+++ b/all-nodes-config.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'All Nodes Config'
 
 parameters:
diff --git a/bootstrap-config.yaml b/bootstrap-config.yaml
index 14da8265..6082dbce 100644
--- a/bootstrap-config.yaml
+++ b/bootstrap-config.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'Bootstrap Config'
 
 parameters:
diff --git a/ceph-cluster-config.yaml b/ceph-cluster-config.yaml
index 6cc170ce..f44e27c1 100644
--- a/ceph-cluster-config.yaml
+++ b/ceph-cluster-config.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'Ceph Cluster config data'
 
 parameters:
diff --git a/ceph-storage-post.yaml b/ceph-storage-post.yaml
index 12d03f18..06c2a291 100644
--- a/ceph-storage-post.yaml
+++ b/ceph-storage-post.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'Ceph Storage Post Deployment'
 # NOTE: this is a noop for os-apply-config style deployments because
 # post deployment ordering is controlled by tripleo-image-elements
diff --git a/ceph-storage.yaml b/ceph-storage.yaml
index 07d7f568..ecb47f26 100644
--- a/ceph-storage.yaml
+++ b/ceph-storage.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'Common Ceph Storage Configuration'
 parameters:
   Image:
diff --git a/cinder-storage-post.yaml b/cinder-storage-post.yaml
index 08818381..8943c502 100644
--- a/cinder-storage-post.yaml
+++ b/cinder-storage-post.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'Common Block Storage Post Deployment'
 # NOTE: this is a noop for os-apply-config style deployments because
 # post deployment ordering is controlled by tripleo-image-elements
diff --git a/cinder-storage.yaml b/cinder-storage.yaml
index 7d44094f..dfbd520e 100644
--- a/cinder-storage.yaml
+++ b/cinder-storage.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'Common Block Storage Configuration'
 parameters:
   Image:
diff --git a/compute-post.yaml b/compute-post.yaml
index bd7639c5..e568a5a6 100644
--- a/compute-post.yaml
+++ b/compute-post.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'Compute Post Deployment'
 # NOTE: this is a noop for os-apply-config style deployments because
 # post deployment ordering is controlled by tripleo-image-elements
diff --git a/compute.yaml b/compute.yaml
index 672687ca..81d275cc 100644
--- a/compute.yaml
+++ b/compute.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: >
   OpenStack hypervisor node. Can be wrapped in a ResourceGroup for scaling.
diff --git a/controller-post.yaml b/controller-post.yaml
index e630c221..926adeae 100644
--- a/controller-post.yaml
+++ b/controller-post.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'Controller Post Deployment'
 # NOTE: this is a noop for os-apply-config style deployments because
 # post deployment ordering is controlled by tripleo-image-elements
diff --git a/controller.yaml b/controller.yaml
index bbac3a68..0e7e70f3 100644
--- a/controller.yaml
+++ b/controller.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: >
   OpenStack control plane node. Can be wrapped in a ResourceGroup for scaling.
diff --git a/net-config-bond.yaml b/net-config-bond.yaml
index 3518dbae..dc4683f1 100644
--- a/net-config-bond.yaml
+++ b/net-config-bond.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: >
   Software Config to drive os-net-config with 2 bonded nics on a bridge.
diff --git a/net-config-bridge.yaml b/net-config-bridge.yaml
index d1faa5df..61090022 100644
--- a/net-config-bridge.yaml
+++ b/net-config-bridge.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: >
   Software Config to drive os-net-config for a simple bridge.
diff --git a/net-config-noop.yaml b/net-config-noop.yaml
index a3b1d1af..35cfecc4 100644
--- a/net-config-noop.yaml
+++ b/net-config-noop.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: >
   Software Config to no-op for os-net-config. Using this will allow you
diff --git a/network/external.yaml b/network/external.yaml
index 29b10324..e9aa5b32 100644
--- a/network/external.yaml
+++ b/network/external.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: >
   External network. Public traffic, Neutron l3router for floating IPs/SNAT, etc.
diff --git a/network/internal_api.yaml b/network/internal_api.yaml
index dfaa9e3b..5abfb117 100644
--- a/network/internal_api.yaml
+++ b/network/internal_api.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: >
   Internal API network. Used for most APIs, Database, RPC.
diff --git a/network/networks.yaml b/network/networks.yaml
index 7d36707d..6618af38 100644
--- a/network/networks.yaml
+++ b/network/networks.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: Create networks to split out Overcloud traffic
 
diff --git a/network/noop.yaml b/network/noop.yaml
index 6f02db4d..0963d2ce 100644
--- a/network/noop.yaml
+++ b/network/noop.yaml
@@ -1,3 +1,3 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: A stack which creates no network(s).
diff --git a/network/storage.yaml b/network/storage.yaml
index a015465c..1f60adf4 100644
--- a/network/storage.yaml
+++ b/network/storage.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: >
   Storage network.
diff --git a/network/storage_mgmt.yaml b/network/storage_mgmt.yaml
index c4c61905..e97d4364 100644
--- a/network/storage_mgmt.yaml
+++ b/network/storage_mgmt.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: >
   Storage management network. Storage replication, etc.
diff --git a/network/tenant.yaml b/network/tenant.yaml
index 55a1f53d..db7f99f3 100644
--- a/network/tenant.yaml
+++ b/network/tenant.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: >
   Tenant network.
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index d3f8c59d..d9fcab00 100644
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: >
   Nova API,Keystone,Heat Engine and API,Glance,Neutron,Dedicated MySQL
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index c6dcaecb..b703d5cb 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'All Nodes Config for Puppet'
 
 parameters:
diff --git a/puppet/bootstrap-config.yaml b/puppet/bootstrap-config.yaml
index a8eb7585..c88ed408 100644
--- a/puppet/bootstrap-config.yaml
+++ b/puppet/bootstrap-config.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'Bootstrap Config Puppet'
 
 parameters:
diff --git a/puppet/ceph-cluster-config.yaml b/puppet/ceph-cluster-config.yaml
index e5be5c9d..33b18574 100644
--- a/puppet/ceph-cluster-config.yaml
+++ b/puppet/ceph-cluster-config.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'Ceph Cluster config data for Puppet'
 
 parameters:
diff --git a/puppet/ceph-storage-post-puppet.yaml b/puppet/ceph-storage-post-puppet.yaml
index 93cc8d1d..eb62ba1e 100644
--- a/puppet/ceph-storage-post-puppet.yaml
+++ b/puppet/ceph-storage-post-puppet.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: >
   OpenStack ceph storage node post deployment for Puppet
diff --git a/puppet/ceph-storage-puppet.yaml b/puppet/ceph-storage-puppet.yaml
index bc9b4b5a..e3d623fd 100644
--- a/puppet/ceph-storage-puppet.yaml
+++ b/puppet/ceph-storage-puppet.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'OpenStack ceph storage node configured by Puppet'
 parameters:
   Flavor:
diff --git a/puppet/cinder-storage-post.yaml b/puppet/cinder-storage-post.yaml
index e11493c4..f17a1567 100644
--- a/puppet/cinder-storage-post.yaml
+++ b/puppet/cinder-storage-post.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'OpenStack cinder storage post deployment for Puppet'
 
 parameters:
diff --git a/puppet/cinder-storage-puppet.yaml b/puppet/cinder-storage-puppet.yaml
index 708f6a9b..adf667ff 100644
--- a/puppet/cinder-storage-puppet.yaml
+++ b/puppet/cinder-storage-puppet.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'OpenStack cinder storage configured by Puppet'
 parameters:
   Image:
diff --git a/puppet/compute-post-puppet.yaml b/puppet/compute-post-puppet.yaml
index 26c1a979..ca5eb649 100644
--- a/puppet/compute-post-puppet.yaml
+++ b/puppet/compute-post-puppet.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: >
   OpenStack compute node post deployment for Puppet.
diff --git a/puppet/compute-puppet.yaml b/puppet/compute-puppet.yaml
index 367bc405..b5eb2781 100644
--- a/puppet/compute-puppet.yaml
+++ b/puppet/compute-puppet.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: >
   OpenStack hypervisor node configured via Puppet.
diff --git a/puppet/controller-config-pacemaker.yaml b/puppet/controller-config-pacemaker.yaml
index 4cec83a2..38161cd7 100644
--- a/puppet/controller-config-pacemaker.yaml
+++ b/puppet/controller-config-pacemaker.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: >
   A software config which runs manifests/overcloud_controller_pacemaker.pp
diff --git a/puppet/controller-config.yaml b/puppet/controller-config.yaml
index 34c68ba7..4135ffac 100644
--- a/puppet/controller-config.yaml
+++ b/puppet/controller-config.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: >
   A software config which runs manifests/overcloud_controller.pp
diff --git a/puppet/controller-post-puppet.yaml b/puppet/controller-post-puppet.yaml
index 7aab7f5a..378af608 100644
--- a/puppet/controller-post-puppet.yaml
+++ b/puppet/controller-post-puppet.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: >
   OpenStack controller node post deployment for Puppet.
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 2d174f75..73a866f4 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 
 description: >
   OpenStack controller node configured by Puppet.
diff --git a/puppet/swift-devices-and-proxy-config.yaml b/puppet/swift-devices-and-proxy-config.yaml
index 731f69a1..92ef5c1c 100644
--- 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:
diff --git a/puppet/swift-storage-post.yaml b/puppet/swift-storage-post.yaml
index 3e01fe77..7a3c1abb 100644
--- a/puppet/swift-storage-post.yaml
+++ b/puppet/swift-storage-post.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'OpenStack swift storage node post deployment for Puppet'
 
 parameters:
diff --git a/puppet/swift-storage-puppet.yaml b/puppet/swift-storage-puppet.yaml
index 45922436..b1c4f238 100644
--- a/puppet/swift-storage-puppet.yaml
+++ b/puppet/swift-storage-puppet.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'OpenStack swift storage node configured by Puppet'
 parameters:
   Flavor:
diff --git a/swift-devices-and-proxy-config.yaml b/swift-devices-and-proxy-config.yaml
index d422a3ef..4f01dbea 100644
--- a/swift-devices-and-proxy-config.yaml
+++ b/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'
 
 parameters:
diff --git a/swift-storage-post.yaml b/swift-storage-post.yaml
index dd51af0e..53490d71 100644
--- a/swift-storage-post.yaml
+++ b/swift-storage-post.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'Swift Storage Post Deployment'
 # NOTE: this is a noop for os-apply-config style deployments because
 # post deployment ordering is controlled by tripleo-image-elements
diff --git a/swift-storage.yaml b/swift-storage.yaml
index 42c591d2..ea288649 100644
--- a/swift-storage.yaml
+++ b/swift-storage.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: 2015-04-30
 description: 'Common Swift Storage Configuration'
 parameters:
   ExtraConfig: