From b56c2f01bdc32d407dc6b981abf30465ddd0b9f8 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Wed, 20 May 2015 10:08:18 -0700 Subject: [PATCH] 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 --- all-nodes-config.yaml | 2 +- bootstrap-config.yaml | 2 +- ceph-cluster-config.yaml | 2 +- ceph-storage-post.yaml | 2 +- ceph-storage.yaml | 2 +- cinder-storage-post.yaml | 2 +- cinder-storage.yaml | 2 +- compute-post.yaml | 2 +- compute.yaml | 2 +- controller-post.yaml | 2 +- controller.yaml | 2 +- net-config-bond.yaml | 2 +- net-config-bridge.yaml | 2 +- net-config-noop.yaml | 2 +- network/external.yaml | 2 +- network/internal_api.yaml | 2 +- network/networks.yaml | 2 +- network/noop.yaml | 2 +- network/storage.yaml | 2 +- network/storage_mgmt.yaml | 2 +- network/tenant.yaml | 2 +- overcloud-without-mergepy.yaml | 2 +- puppet/all-nodes-config.yaml | 2 +- puppet/bootstrap-config.yaml | 2 +- puppet/ceph-cluster-config.yaml | 2 +- puppet/ceph-storage-post-puppet.yaml | 2 +- puppet/ceph-storage-puppet.yaml | 2 +- puppet/cinder-storage-post.yaml | 2 +- puppet/cinder-storage-puppet.yaml | 2 +- puppet/compute-post-puppet.yaml | 2 +- puppet/compute-puppet.yaml | 2 +- puppet/controller-config-pacemaker.yaml | 2 +- puppet/controller-config.yaml | 2 +- puppet/controller-post-puppet.yaml | 2 +- puppet/controller-puppet.yaml | 2 +- puppet/swift-devices-and-proxy-config.yaml | 2 +- puppet/swift-storage-post.yaml | 2 +- puppet/swift-storage-puppet.yaml | 2 +- swift-devices-and-proxy-config.yaml | 2 +- swift-storage-post.yaml | 2 +- swift-storage.yaml | 2 +- 41 files changed, 41 insertions(+), 41 deletions(-) diff --git a/all-nodes-config.yaml b/all-nodes-config.yaml index 7fa27c5da4..9687dafc41 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 14da82658a..6082dbced0 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 6cc170cebc..f44e27c105 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 12d03f188c..06c2a2919a 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 07d7f568e1..ecb47f2686 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 0881838140..8943c502ef 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 7d44094ffa..dfbd520ed5 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 bd7639c527..e568a5a6e8 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 672687ca8c..81d275ccf8 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 e630c221f8..926adeae22 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 bbac3a6876..0e7e70f38e 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 3518dbae64..dc4683f13e 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 d1faa5df95..6109002285 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 a3b1d1afae..35cfecc426 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 29b10324ad..e9aa5b3287 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 dfaa9e3b18..5abfb11715 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 7d36707dcc..6618af3850 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 6f02db4d67..0963d2ce43 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 a015465cdc..1f60adf4bb 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 c4c61905c2..e97d4364af 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 55a1f53dab..db7f99f383 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 d3f8c59da8..d9fcab0062 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 c6dcaecb74..b703d5cba4 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 a8eb758570..c88ed408b2 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 e5be5c9de9..33b18574ab 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 93cc8d1d6d..eb62ba1e9c 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 bc9b4b5a5b..e3d623fd4a 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 e11493c4a7..f17a156703 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 708f6a9b6f..adf667ff8e 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 26c1a9799b..ca5eb64984 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 367bc405bd..b5eb278147 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 4cec83a2af..38161cd797 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 34c68ba7b9..4135ffac49 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 7aab7f5a3f..378af608ad 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 2d174f7568..73a866f403 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 731f69a1a2..92ef5c1c4d 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 3e01fe7722..7a3c1abb19 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 4592243630..b1c4f2380b 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 d422a3eff5..4f01dbea78 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 dd51af0eb8..53490d7146 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 42c591d2e3..ea288649a8 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: