openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Change template names to rocky 

The new master branch should point now to rocky.

So, HOT templates should specify that they might contain features
for rocky release [1]

Also, this submission updates the yaml validation to use only latest
heat_version alias. There are cases in which we will need to set
the version for specific templates i.e. mixed versions, so there
is added a variable to assign specific templates to specific heat_version
aliases, avoiding the introductions of error by bulk replacing the
the old version in new releases.

[1]: https://docs.openstack.org/heat/latest/template_guide/hot_spec.html#rocky
Change-Id: Ib17526d9cc453516d99d4659ee5fa51a5aa7fb4b
This commit is contained in:
Carlos Camacho 2018-03-05 19:28:35 +01:00
parent 1e9bd2bc9e
commit 44ef2a3ec1
492 changed files with 521 additions and 496 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
all-nodes-validation.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
Software Config to drive validations that occur on all nodes. Software Config to drive validations that occur on all nodes.

2
bootstrap-config.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: 'Bootstrap Config' description: 'Bootstrap Config'
parameters: parameters:

2
ci/common/all-nodes-validation-disabled.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
Software Config to drive validations that occur on all nodes. Software Config to drive validations that occur on all nodes.

2
ci/common/net-config-multinode-os-net-config.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
Software Config to drive os-net-config for a simple bridge configured Software Config to drive os-net-config for a simple bridge configured

2
ci/common/net-config-multinode.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
Software Config to drive os-net-config for a simple bridge configured Software Config to drive os-net-config for a simple bridge configured

2
ci/common/net-config-simple-bridge.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
Software Config to drive os-net-config for a simple bridge. Software Config to drive os-net-config for a simple bridge.
parameters: parameters:

2
ci/environments/multinode-core.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack Core Service OpenStack Core Service

2
ci/environments/network/multiple-nics-ipv6/nic-configs/ceph-storage.yaml
View File

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

2
ci/environments/network/multiple-nics-ipv6/nic-configs/cinder-storage.yaml
View File

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

2
ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml
View File

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

2
ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml
View File

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

2
ci/environments/network/multiple-nics-ipv6/nic-configs/swift-storage.yaml
View File

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

2
ci/environments/network/multiple-nics/nic-configs/ceph-storage.yaml
View File

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

2
ci/environments/network/multiple-nics/nic-configs/cinder-storage.yaml
View File

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

2
ci/environments/network/multiple-nics/nic-configs/compute.yaml
View File

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

2
ci/environments/network/multiple-nics/nic-configs/controller.yaml
View File

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

2
ci/environments/network/multiple-nics/nic-configs/swift-storage.yaml
View File

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

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

@ -1,4 +1,4 @@
heat_template_version: ocata heat_template_version: rocky
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: rocky
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: rocky
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: rocky
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: rocky
parameters: parameters:
ControlPlaneIp: ControlPlaneIp:

3
ci/pingtests/tenantvm_floatingip.yaml
View File

@ -1,5 +1,8 @@
heat_template_version: ocata heat_template_version: ocata
# Keep the template version old enough to support older release testing. # Keep the template version old enough to support older release testing.
# In mixed version test scenario, we can have a ping test triggered
# after the overcloud installation just to make sure that it works.
# If we move this template version then this scenario cannot work.
description: > description: >
HOT template to create a new neutron network plus a router to the public HOT template to create a new neutron network plus a router to the public

2
common/deploy-steps.j2
View File

@ -23,7 +23,7 @@
{% set fast_forward_upgrade_prep_steps_max = 3 -%} {% set fast_forward_upgrade_prep_steps_max = 3 -%}
{% set post_update_steps_max = 4 -%} {% set post_update_steps_max = 4 -%}
heat_template_version: queens heat_template_version: rocky
description: > description: >
Post-deploy configuration steps via puppet for all roles, Post-deploy configuration steps via puppet for all roles,

2
common/services.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
Utility stack to convert an array of services into a set of combined Utility stack to convert an array of services into a set of combined

2
config-download-software.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
parameters: parameters:

2
config-download-structured.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
parameters: parameters:

2
default_passwords.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: Passwords we manage at the top level description: Passwords we manage at the top level

2
deployed-server/ctlplane-port.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
parameters: parameters:
network: network:

2
deployed-server/deployed-neutron-port.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: " description: "
A fake OS::Neutron::Port stack which outputs fixed_ips and subnets based on A fake OS::Neutron::Port stack which outputs fixed_ips and subnets based on

2
deployed-server/deployed-server-bootstrap-centos.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: 'Deployed Server Bootstrap Config' description: 'Deployed Server Bootstrap Config'

2
deployed-server/deployed-server-bootstrap-rhel.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: 'Deployed Server Bootstrap Config' description: 'Deployed Server Bootstrap Config'

2
deployed-server/deployed-server-environment-output.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
parameters: parameters:
RoleCounts: RoleCounts:

2
deployed-server/deployed-server.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
parameters: parameters:
image: image:
type: string type: string

2
docker/services/aodh-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized aodh service OpenStack containerized aodh service

2
docker/services/aodh-evaluator.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Aodh Evaluator service OpenStack containerized Aodh Evaluator service

2
docker/services/aodh-listener.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Aodh Listener service OpenStack containerized Aodh Listener service

2
docker/services/aodh-notifier.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Aodh Notifier service OpenStack containerized Aodh Notifier service

2
docker/services/barbican-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Barbican API service OpenStack containerized Barbican API service

2
docker/services/ceilometer-agent-central.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Ceilometer Agent Central service OpenStack containerized Ceilometer Agent Central service

2
docker/services/ceilometer-agent-compute.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Ceilometer Agent Compute service OpenStack containerized Ceilometer Agent Compute service

2
docker/services/ceilometer-agent-ipmi.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Ceilometer Agent Ipmi service OpenStack containerized Ceilometer Agent Ipmi service

2
docker/services/ceilometer-agent-notification.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Ceilometer Agent Notification service OpenStack containerized Ceilometer Agent Notification service

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

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
Ceph base service. Shared by all Ceph services. Ceph base service. Shared by all Ceph services.

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

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
Ceph Client service. Ceph Client service.

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

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
Ceph External service. Ceph External service.

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

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
Ceph Metadata service. Ceph Metadata service.

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

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
Ceph Manager service. Ceph Manager service.

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

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
Ceph Monitor service. Ceph Monitor service.

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

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

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

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
Ceph OSD service. Ceph OSD service.

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

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
Ceph RBD Mirror service. Ceph RBD Mirror service.

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

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
Ceph RadosGW service. Ceph RadosGW service.

2
docker/services/cinder-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Cinder API service OpenStack containerized Cinder API service

2
docker/services/cinder-backup.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Cinder Backup service OpenStack containerized Cinder Backup service

2
docker/services/cinder-common.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
Provides the list of Docker volumes and environment to be used by the Provides the list of Docker volumes and environment to be used by the

2
docker/services/cinder-scheduler.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Cinder Scheduler service OpenStack containerized Cinder Scheduler service

2
docker/services/cinder-volume.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Cinder Volume service OpenStack containerized Cinder Volume service

2
docker/services/collectd.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
Containerized collectd service Containerized collectd service

2
docker/services/congress.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Congress API service OpenStack containerized Congress API service

2
docker/services/containers-common.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
Contains a static list of common things necessary for containers Contains a static list of common things necessary for containers

2
docker/services/database/mongodb.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
MongoDB service deployment using puppet and docker MongoDB service deployment using puppet and docker

2
docker/services/database/mysql.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
MySQL service deployment using puppet MySQL service deployment using puppet

2
docker/services/database/redis.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Redis services OpenStack containerized Redis services

2
docker/services/designate-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Designate API service OpenStack containerized Designate API service

2
docker/services/designate-central.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Designate Central service OpenStack containerized Designate Central service

2
docker/services/designate-mdns.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Designate MiniDNS service OpenStack containerized Designate MiniDNS service

2
docker/services/designate-producer.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Designate Producer service OpenStack containerized Designate Producer service

2
docker/services/designate-sink.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Designate Sink service OpenStack containerized Designate Sink service

2
docker/services/designate-worker.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Designate Worker service OpenStack containerized Designate Worker service

2
docker/services/ec2-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized EC2 API service OpenStack containerized EC2 API service

2
docker/services/etcd.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized etcd services OpenStack containerized etcd services

2
docker/services/fluentd.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized fluentd services OpenStack containerized fluentd services

2
docker/services/glance-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack Glance service configured with Puppet OpenStack Glance service configured with Puppet

2
docker/services/gnocchi-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized gnocchi service OpenStack containerized gnocchi service

2
docker/services/gnocchi-metricd.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Gnocchi Metricd service OpenStack containerized Gnocchi Metricd service

2
docker/services/gnocchi-statsd.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Gnocchi Statsd service OpenStack containerized Gnocchi Statsd service

2
docker/services/haproxy.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized HAproxy service OpenStack containerized HAproxy service

2
docker/services/heat-api-cfn.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Heat API CFN service OpenStack containerized Heat API CFN service

2
docker/services/heat-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Heat API service OpenStack containerized Heat API service

2
docker/services/heat-engine.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Heat Engine service OpenStack containerized Heat Engine service

2
docker/services/horizon.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Horizon service OpenStack containerized Horizon service

2
docker/services/ironic-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Ironic API service OpenStack containerized Ironic API service

2
docker/services/ironic-conductor.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Ironic Conductor service OpenStack containerized Ironic Conductor service

2
docker/services/ironic-inspector.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Ironic Inspector service (EXPERIMENTAL) OpenStack containerized Ironic Inspector service (EXPERIMENTAL)

2
docker/services/ironic-neutron-agent.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack ironic-neutron-agent service OpenStack ironic-neutron-agent service

2
docker/services/ironic-pxe.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Ironic PXE service OpenStack containerized Ironic PXE service

2
docker/services/iscsid.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Iscsid service OpenStack containerized Iscsid service

2
docker/services/keepalived.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Keepalived service OpenStack containerized Keepalived service

2
docker/services/keystone.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Keystone service OpenStack containerized Keystone service

2
docker/services/logging/files/barbican-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Barbican API service OpenStack containerized Barbican API service

2
docker/services/logging/files/glance-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Glance API service OpenStack containerized Glance API service

2
docker/services/logging/files/haproxy.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized HAProxy API service OpenStack containerized HAProxy API service

2
docker/services/logging/files/heat-api-cfn.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Heat API CFN service OpenStack containerized Heat API CFN service

2
docker/services/logging/files/heat-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Heat API service OpenStack containerized Heat API service

2
docker/services/logging/files/heat-engine.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Glance API service OpenStack containerized Glance API service

2
docker/services/logging/files/keystone.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Keystone service OpenStack containerized Keystone service

2
docker/services/logging/files/neutron-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Neutron API service OpenStack containerized Neutron API service

2
docker/services/logging/files/neutron-common.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
OpenStack containerized Neutron service OpenStack containerized Neutron service

2
docker/services/logging/files/nova-api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: queens heat_template_version: rocky
description: > description: >
Template for nova-api's logging to files Template for nova-api's logging to files

Some files were not shown because too many files have changed in this diff Show More