openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Update heat_template_version in templates, with stricter validation 

A number of templates are using older heat_template_version values.
Update the templates and only accept queens in the validation tool.

Change-Id: I2966e38449238d324122e97723795a7ad87f2611
Resolves-bug: 1840246
This commit is contained in:
Oliver Walsh 2019-08-15 13:17:00 +01:00
parent 16140c5f4f
commit a59a78aea8
10 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/environments/network/public-bond/nic-configs/ceph-storage.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: queens
parameters: parameters:
ControlPlaneIp: ControlPlaneIp:

2
ci/environments/network/public-bond/nic-configs/cinder-storage.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: queens
parameters: parameters:
ControlPlaneIp: ControlPlaneIp:

2
ci/environments/network/public-bond/nic-configs/compute.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: queens
parameters: parameters:
ControlPlaneIp: ControlPlaneIp:

2
ci/environments/network/public-bond/nic-configs/controller.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: queens
parameters: parameters:
ControlPlaneIp: ControlPlaneIp:

2
ci/environments/network/public-bond/nic-configs/swift-storage.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: queens
parameters: parameters:
ControlPlaneIp: ControlPlaneIp:

2
docker/services/ceph-ansible/ceph-nfs.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: pike heat_template_version: queens
description: > description: >
Ceph NFS Ganeshaservice. Ceph NFS Ganeshaservice.

2
docker/services/fluentd-client.yaml
View File

@ -1,4 +1,4 @@
# This file is here only to get past heatclient environment processing # This file is here only to get past heatclient environment processing
# error, and is only present for the Queens version of t-h-t. # error, and is only present for the Queens version of t-h-t.
# https://bugs.launchpad.net/tripleo/+bug/1758406 # https://bugs.launchpad.net/tripleo/+bug/1758406
heat_template_version: ocata heat_template_version: queens

2
docker/services/octavia/octavia-deployment-config.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: pike heat_template_version: queens
description: > description: >
Configuration of Octavia as-a-service resources in the overcloud. Configuration of Octavia as-a-service resources in the overcloud.

2
puppet/services/ovn-metadata.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: pike heat_template_version: queens
description: > description: >
OpenStack Networking-ovn Metadata agent configured with Puppet OpenStack Networking-ovn Metadata agent configured with Puppet

2
tools/yaml-validate.py
View File

@ -20,8 +20,6 @@ import yaml
# Only permit the template alias versions # Only permit the template alias versions
# The current template version should be the last element # The current template version should be the last element
valid_heat_template_versions = [ valid_heat_template_versions = [
'ocata',
'pike',
'queens', 'queens',
] ]
current_heat_template_version = valid_heat_template_versions[-1] current_heat_template_version = valid_heat_template_versions[-1]