From b13728cac3b7b049388a6fa4fde3c60b4b4e6e9c Mon Sep 17 00:00:00 2001
From: Carlos Camacho <ccamacho@redhat.com>
Date: Wed, 20 Dec 2017 10:26:10 +0100
Subject: [PATCH] Update templates alias to queens

There are still some templates with the wrong
alias name. This patch updates them with the
correct version.

Change-Id: I43549ac98f3736029d4aaad1ead745caf40f9299
---
 .../network/multiple-nics-ipv6/nic-configs/ceph-storage.yaml    | 2 +-
 .../network/multiple-nics-ipv6/nic-configs/cinder-storage.yaml  | 2 +-
 .../network/multiple-nics-ipv6/nic-configs/compute.yaml         | 2 +-
 .../network/multiple-nics-ipv6/nic-configs/controller.yaml      | 2 +-
 .../network/multiple-nics-ipv6/nic-configs/swift-storage.yaml   | 2 +-
 extraconfig/services/ipsec.yaml                                 | 2 +-
 extraconfig/services/kubernetes-master.yaml                     | 2 +-
 extraconfig/services/kubernetes-worker.yaml                     | 2 +-
 extraconfig/services/openshift-master.yaml                      | 2 +-
 extraconfig/services/openshift-worker.yaml                      | 2 +-
 puppet/services/login-defs.yaml                                 | 2 +-
 puppet/services/neutron-plugin-ml2-cisco-vts.yaml               | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/ceph-storage.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/ceph-storage.yaml
index dcd3533b16..76f012cebf 100644
--- a/ci/environments/network/multiple-nics-ipv6/nic-configs/ceph-storage.yaml
+++ b/ci/environments/network/multiple-nics-ipv6/nic-configs/ceph-storage.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: queens
 
 parameters:
   ControlPlaneIp:
diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/cinder-storage.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/cinder-storage.yaml
index 160cfca2fb..c87a6c4c68 100644
--- a/ci/environments/network/multiple-nics-ipv6/nic-configs/cinder-storage.yaml
+++ b/ci/environments/network/multiple-nics-ipv6/nic-configs/cinder-storage.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: queens
 
 parameters:
   ControlPlaneIp:
diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml
index 882121e130..48a16c683f 100644
--- a/ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml
+++ b/ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: queens
 
 parameters:
   ControlPlaneIp:
diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml
index 389c433f87..4f5bf17b1c 100644
--- a/ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml
+++ b/ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: queens
 
 parameters:
   ControlPlaneIp:
diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/swift-storage.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/swift-storage.yaml
index 160cfca2fb..c87a6c4c68 100644
--- a/ci/environments/network/multiple-nics-ipv6/nic-configs/swift-storage.yaml
+++ b/ci/environments/network/multiple-nics-ipv6/nic-configs/swift-storage.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: queens
 
 parameters:
   ControlPlaneIp:
diff --git a/extraconfig/services/ipsec.yaml b/extraconfig/services/ipsec.yaml
index 49cfd5ec9b..a420f6773d 100644
--- a/extraconfig/services/ipsec.yaml
+++ b/extraconfig/services/ipsec.yaml
@@ -1,4 +1,4 @@
-heat_template_version: pike
+heat_template_version: queens
 
 description: Enables IPSEC for the overcloud
 
diff --git a/extraconfig/services/kubernetes-master.yaml b/extraconfig/services/kubernetes-master.yaml
index 098b46fb5d..615353523d 100644
--- a/extraconfig/services/kubernetes-master.yaml
+++ b/extraconfig/services/kubernetes-master.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: queens
 
 description: Triggers a Mistral workflow for the deployment of Kubernetes
 
diff --git a/extraconfig/services/kubernetes-worker.yaml b/extraconfig/services/kubernetes-worker.yaml
index 16e4b702ad..e8d4ae6d02 100644
--- a/extraconfig/services/kubernetes-worker.yaml
+++ b/extraconfig/services/kubernetes-worker.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: queens
 
 description: Triggers a Mistral workflow for the deployment of Kubernetes
 
diff --git a/extraconfig/services/openshift-master.yaml b/extraconfig/services/openshift-master.yaml
index 36d9d64ae6..d1e4f44fd1 100644
--- a/extraconfig/services/openshift-master.yaml
+++ b/extraconfig/services/openshift-master.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: queens
 
 description: External tasks definition for OpenShift
 
diff --git a/extraconfig/services/openshift-worker.yaml b/extraconfig/services/openshift-worker.yaml
index 38dd5a7103..7fac2b2f9c 100644
--- a/extraconfig/services/openshift-worker.yaml
+++ b/extraconfig/services/openshift-worker.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: queens
 
 description: External tasks definition for OpenShift
 
diff --git a/puppet/services/login-defs.yaml b/puppet/services/login-defs.yaml
index acd4a8faf2..0085f52ee7 100644
--- a/puppet/services/login-defs.yaml
+++ b/puppet/services/login-defs.yaml
@@ -1,4 +1,4 @@
-heat_template_version: pike
+heat_template_version: queens
 
 description: >
   Configure login.defs values
diff --git a/puppet/services/neutron-plugin-ml2-cisco-vts.yaml b/puppet/services/neutron-plugin-ml2-cisco-vts.yaml
index b8352047a8..ec81907a2d 100644
--- a/puppet/services/neutron-plugin-ml2-cisco-vts.yaml
+++ b/puppet/services/neutron-plugin-ml2-cisco-vts.yaml
@@ -1,4 +1,4 @@
-heat_template_version: pike
+heat_template_version: queens
 
 description: >
   VTS Controller Settings for the Cisco VTS Neutron ML2 Plugin.