Merge "Update templates alias to queens"

2017-12-23 07:20:34 +00:00 · 2017-12-23 07:20:34 +00:00 · 8809cd0ad4
commit 8809cd0ad4
parent 28cbfa8d33 b13728cac3
12 changed files with 12 additions and 12 deletions
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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

--- 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

--- 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

--- 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

--- 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

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