summaryrefslogtreecommitdiffstats
path: root/extraconfig
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-18 10:21:18 +0000
committerGerrit Code Review <review@openstack.org>2017-01-18 10:21:18 +0000
commita83fca48f2800c09172a2c2c1204afaccefc6639 (patch)
tree8de1bd0f22a51bf9f2d76fa67c748af3d3d0628a /extraconfig
parent51a43d81acd17d36bff47b01c353f580fc2ffc03 (diff)
parentddca77553dbe05400bc9bce5004a5cc07b307b9c (diff)
Merge "Bump missing template names to ocata"
Diffstat (limited to 'extraconfig')
-rw-r--r--extraconfig/pre_network/config_then_reboot.yaml2
-rw-r--r--extraconfig/pre_network/host_config_and_reboot.role.j2.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/extraconfig/pre_network/config_then_reboot.yaml b/extraconfig/pre_network/config_then_reboot.yaml
index ec4d2761..bb0b9511 100644
--- a/extraconfig/pre_network/config_then_reboot.yaml
+++ b/extraconfig/pre_network/config_then_reboot.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2014-10-16
+heat_template_version: ocata
description: >
Do some configuration, then reboot - sometimes needed for early-boot
diff --git a/extraconfig/pre_network/host_config_and_reboot.role.j2.yaml b/extraconfig/pre_network/host_config_and_reboot.role.j2.yaml
index bba16a66..4ad53cb8 100644
--- a/extraconfig/pre_network/host_config_and_reboot.role.j2.yaml
+++ b/extraconfig/pre_network/host_config_and_reboot.role.j2.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-10-14
+heat_template_version: ocata
description: >
Do some configuration, then reboot - sometimes needed for early-boot