Merge "Overcloud: bump HOT version to 2015-04-30"

2015-05-21 16:03:12 +00:00 · 2015-05-21 16:03:12 +00:00 · eaa66742a7
parent 87f2c951b8 b56c2f01bd
commit eaa66742a7
41 changed files with 41 additions and 41 deletions
--- 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:
--- 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:
--- 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:
--- 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
--- 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:
--- 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
--- 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:
--- 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
--- 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.
--- 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
--- 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.
--- 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.
--- 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.
--- 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
--- 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.
--- 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.
--- 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

--- 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).
--- 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.
--- 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.
--- 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.
--- 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
--- 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:
--- 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:
--- 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:
--- 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
--- 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:
--- 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:
--- 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:
--- 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.
--- 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.
--- 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
--- 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
--- 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.
--- 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.
--- 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:
--- 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:
--- 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:
--- 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:
--- 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
--- 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: