aboutsummaryrefslogtreecommitdiffstats
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
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
-rw-r--r--all-nodes-config.yaml2
-rw-r--r--bootstrap-config.yaml2
-rw-r--r--ceph-cluster-config.yaml2
-rw-r--r--ceph-storage-post.yaml2
-rw-r--r--ceph-storage.yaml2
-rw-r--r--cinder-storage-post.yaml2
-rw-r--r--cinder-storage.yaml2
-rw-r--r--compute-post.yaml2
-rw-r--r--compute.yaml2
-rw-r--r--controller-post.yaml2
-rw-r--r--controller.yaml2
-rw-r--r--net-config-bond.yaml2
-rw-r--r--net-config-bridge.yaml2
-rw-r--r--net-config-noop.yaml2
-rw-r--r--network/external.yaml2
-rw-r--r--network/internal_api.yaml2
-rw-r--r--network/networks.yaml2
-rw-r--r--network/noop.yaml2
-rw-r--r--network/storage.yaml2
-rw-r--r--network/storage_mgmt.yaml2
-rw-r--r--network/tenant.yaml2
-rw-r--r--overcloud-without-mergepy.yaml2
-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
-rw-r--r--swift-devices-and-proxy-config.yaml2
-rw-r--r--swift-storage-post.yaml2
-rw-r--r--swift-storage.yaml2
41 files changed, 41 insertions, 41 deletions
diff --git a/all-nodes-config.yaml b/all-nodes-config.yaml
index 7fa27c5..9687daf 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 14da826..6082dbc 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 6cc170c..f44e27c 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 12d03f1..06c2a29 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 07d7f56..ecb47f2 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 0881838..8943c50 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 7d44094..dfbd520 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 bd7639c..e568a5a 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 672687c..81d275c 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 e630c22..926adea 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 bbac3a6..0e7e70f 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 3518dba..dc4683f 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 d1faa5d..6109002 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 a3b1d1a..35cfecc 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 29b1032..e9aa5b3 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 dfaa9e3..5abfb11 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 7d36707..6618af3 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 6f02db4..0963d2c 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 a015465..1f60adf 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 c4c6190..e97d436 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 55a1f53..db7f99f 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 d3f8c59..d9fcab0 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 c6dcaec..b703d5c 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 a8eb758..c88ed40 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 e5be5c9..33b1857 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 93cc8d1..eb62ba1 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 bc9b4b5..e3d623f 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 e11493c..f17a156 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 708f6a9..adf667f 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 26c1a97..ca5eb64 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 367bc40..b5eb278 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 4cec83a..38161cd 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 34c68ba..4135ffa 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 7aab7f5..378af60 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 2d174f7..73a866f 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 731f69a..92ef5c1 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 3e01fe7..7a3c1ab 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 4592243..b1c4f23 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 d422a3e..4f01dbe 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 dd51af0..53490d7 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 42c591d..ea28864 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: