aboutsummaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-03 09:20:41 +0000
committerGerrit Code Review <review@openstack.org>2017-02-03 09:20:41 +0000
commitec24ed7dd82fd4c1553085719e369b545c4beedd (patch)
treed19f1a3a57d5b386e1540a9e697ab626237dd10d /ci
parent9bb44e0a323ed03549ca189d2219122f883ebd2f (diff)
parente5d594ea2de6c4b387f32d0a6cea49accf940454 (diff)
Merge "Moving the validation for using the template alias version for all templates"
Diffstat (limited to 'ci')
-rw-r--r--ci/common/net-config-multinode-os-net-config.yaml2
-rw-r--r--ci/pingtests/tenantvm_floatingip.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/ci/common/net-config-multinode-os-net-config.yaml b/ci/common/net-config-multinode-os-net-config.yaml
index 227c5da..8c50b64 100644
--- a/ci/common/net-config-multinode-os-net-config.yaml
+++ b/ci/common/net-config-multinode-os-net-config.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-10-14
+heat_template_version: ocata
description: >
Software Config to drive os-net-config for a simple bridge configured
diff --git a/ci/pingtests/tenantvm_floatingip.yaml b/ci/pingtests/tenantvm_floatingip.yaml
index 0f31bc1..b910d6c 100644
--- a/ci/pingtests/tenantvm_floatingip.yaml
+++ b/ci/pingtests/tenantvm_floatingip.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2013-05-23
+heat_template_version: ocata
description: >
This template resides in tripleo-ci for Mitaka CI jobs only.