summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2015-05-20 10:08:18 -0700
committerDan Prince <dprince@redhat.com>2015-05-20 11:37:46 -0700
commitb56c2f01bdc32d407dc6b981abf30465ddd0b9f8 (patch)
tree818b9f8049406d1a832596b67c4e1aeaa8fb6651 /puppet
parente4dfaf4ab8295fdcb844b70238aae21a109d5282 (diff)
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
Diffstat (limited to 'puppet')
-rw-r--r--puppet/all-nodes-config.yaml2
-rw-r--r--puppet/bootstrap-config.yaml2
-rw-r--r--puppet/ceph-cluster-config.yaml2
-rw-r--r--puppet/ceph-storage-post-puppet.yaml2
-rw-r--r--puppet/ceph-storage-puppet.yaml2
-rw-r--r--puppet/cinder-storage-post.yaml2
-rw-r--r--puppet/cinder-storage-puppet.yaml2
-rw-r--r--puppet/compute-post-puppet.yaml2
-rw-r--r--puppet/compute-puppet.yaml2
-rw-r--r--puppet/controller-config-pacemaker.yaml2
-rw-r--r--puppet/controller-config.yaml2
-rw-r--r--puppet/controller-post-puppet.yaml2
-rw-r--r--puppet/controller-puppet.yaml2
-rw-r--r--puppet/swift-devices-and-proxy-config.yaml2
-rw-r--r--puppet/swift-storage-post.yaml2
-rw-r--r--puppet/swift-storage-puppet.yaml2
16 files changed, 16 insertions, 16 deletions
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: