From 21a3b21e778765a4031dafcc2217e50c0c19e4e7 Mon Sep 17 00:00:00 2001 From: yatin karel Date: Mon, 4 Jul 2016 22:19:50 +0530 Subject: [PATCH] Update default version of heat template Make consistent default version of heat template across kubernetes, swarm and mesos Change-Id: I5f8231336a6832ae8ecd8f789ed0b51ba5062729 Closes-Bug: #1425368 --- contrib/templates/example/example_template/example.yaml | 4 ++-- .../drivers/k8s_coreos_v1/templates/kubecluster-coreos.yaml | 2 +- magnum/drivers/k8s_coreos_v1/templates/kubemaster-coreos.yaml | 2 +- magnum/drivers/k8s_coreos_v1/templates/kubeminion-coreos.yaml | 2 +- .../templates/fragments/api_gateway_switcher_master.yaml | 2 +- .../templates/fragments/api_gateway_switcher_pool.yaml | 2 +- .../templates/kubecluster-fedora-ironic.yaml | 2 +- .../drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml | 2 +- .../templates/kubemaster-fedora-ironic.yaml | 2 +- magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml | 2 +- .../templates/kubeminion-fedora-ironic.yaml | 2 +- magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml | 2 +- magnum/drivers/mesos_ubuntu_v1/templates/mesosmaster.yaml | 2 +- magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml | 2 +- .../drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml | 2 +- .../drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/contrib/templates/example/example_template/example.yaml b/contrib/templates/example/example_template/example.yaml index 5e48fa7c46..bd9379f502 100644 --- a/contrib/templates/example/example_template/example.yaml +++ b/contrib/templates/example/example_template/example.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 description: > This is just an example template. It does not produce a usable bay. @@ -42,4 +42,4 @@ outputs: value: {get_attr: [example_server, accessIPv4]} node_addresses: - value: [] \ No newline at end of file + value: [] diff --git a/magnum/drivers/k8s_coreos_v1/templates/kubecluster-coreos.yaml b/magnum/drivers/k8s_coreos_v1/templates/kubecluster-coreos.yaml index be5207748b..fd2ec3aed3 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/kubecluster-coreos.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/kubecluster-coreos.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 description: > This template will boot a coreos cluster with one or more minions (as diff --git a/magnum/drivers/k8s_coreos_v1/templates/kubemaster-coreos.yaml b/magnum/drivers/k8s_coreos_v1/templates/kubemaster-coreos.yaml index aadb45eff4..f979267b5a 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/kubemaster-coreos.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/kubemaster-coreos.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 description: > This is a nested stack that defines a Kubernetes master. This stack is diff --git a/magnum/drivers/k8s_coreos_v1/templates/kubeminion-coreos.yaml b/magnum/drivers/k8s_coreos_v1/templates/kubeminion-coreos.yaml index a26897b61f..7eec54138a 100644 --- a/magnum/drivers/k8s_coreos_v1/templates/kubeminion-coreos.yaml +++ b/magnum/drivers/k8s_coreos_v1/templates/kubeminion-coreos.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 description: > This is a nested stack that defines a single Kubernetes minion, diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/fragments/api_gateway_switcher_master.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/fragments/api_gateway_switcher_master.yaml index d10437827a..9e20d1207d 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/fragments/api_gateway_switcher_master.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/fragments/api_gateway_switcher_master.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 description: > This is a template resource that accepts public and private IPs from both diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/fragments/api_gateway_switcher_pool.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/fragments/api_gateway_switcher_pool.yaml index 7a1384a4cf..d2887874a1 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/fragments/api_gateway_switcher_pool.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/fragments/api_gateway_switcher_pool.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 description: > This is a template resource that accepts public and private IPs from both diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster-fedora-ironic.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster-fedora-ironic.yaml index ebdd2dc886..5fb7dd70b4 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster-fedora-ironic.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster-fedora-ironic.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 description: > This template will boot a Kubernetes cluster with one or more diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml index b197c9c084..32fe30c185 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubecluster.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 description: > This template will boot a Kubernetes cluster with one or more diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster-fedora-ironic.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster-fedora-ironic.yaml index a7afb0ae2b..822a70b8e4 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster-fedora-ironic.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster-fedora-ironic.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 description: > This template will create a group of kubernetes masters with the diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml index b4fc16038a..a93f8dd22d 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubemaster.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 description: > This is a nested stack that defines a single Kubernetes master, This stack is diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion-fedora-ironic.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion-fedora-ironic.yaml index 038f096c48..fb63cb8a79 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion-fedora-ironic.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion-fedora-ironic.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 description: > This is a nested stack that defines a single Kubernetes minion, diff --git a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml index eb088c7b15..fb80479cb6 100644 --- a/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml +++ b/magnum/drivers/k8s_fedora_atomic_v1/templates/kubeminion.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 description: > This is a nested stack that defines a single Kubernetes minion, This stack is diff --git a/magnum/drivers/mesos_ubuntu_v1/templates/mesosmaster.yaml b/magnum/drivers/mesos_ubuntu_v1/templates/mesosmaster.yaml index e345692444..9b6eeaa4b2 100644 --- a/magnum/drivers/mesos_ubuntu_v1/templates/mesosmaster.yaml +++ b/magnum/drivers/mesos_ubuntu_v1/templates/mesosmaster.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 description: > This is a nested stack that defines a single Mesos master, This stack is diff --git a/magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml b/magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml index 3c369d4d05..ad7138fa8f 100644 --- a/magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml +++ b/magnum/drivers/swarm_fedora_atomic_v1/templates/cluster.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 description: > This template will boot a Docker swarm cluster. A swarm cluster is made up diff --git a/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml b/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml index 67a23e3536..78a163b6d2 100644 --- a/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml +++ b/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 description: > This is a nested stack that defines swarm master node. A swarm mater node is diff --git a/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml b/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml index f12744c814..7e79496601 100644 --- a/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml +++ b/magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml @@ -1,4 +1,4 @@ -heat_template_version: 2013-05-23 +heat_template_version: 2014-10-16 description: > This is a nested stack that defines a single swarm node,