openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Bump template version for all templates to "ocata" 

Heat now supports release name aliases, so we can replace
the inconsistent mix of date related versions with one consistent
version that aligns with the supported version of heat for this
t-h-t branch.

This should also help new users who sometimes copy/paste old templates
and discover intrinsic functions in the t-h-t docs don't work because
their template version is too old.

Change-Id: Ib415e7290fea27447460baa280291492df197e54
changes/55/414555/1
Steven Hardy 2016-12-23 11:43:39 +00:00
parent db45116afd
commit 3c6ec654b4
325 changed files with 325 additions and 325 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: 2015-04-30
heat_template_version: ocata
description: >
Software Config to drive validations that occur on all nodes.

2
bootstrap-config.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: ocata
description: 'Bootstrap Config'
parameters:

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

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: ocata
description: >
Software Config to drive os-net-config for a simple bridge configured

2
ci/pingtests/scenario001-multinode.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2013-05-23
heat_template_version: ocata
description: >
HOT template to created resources deployed by scenario001.

2
ci/pingtests/scenario002-multinode.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2013-05-23
heat_template_version: ocata
description: >
HOT template to created resources deployed by scenario002.

2
ci/pingtests/scenario003-multinode.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2013-05-23
heat_template_version: ocata
description: >
HOT template to created resources deployed by scenario003.

2
ci/pingtests/scenario004-multinode.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2013-05-23
heat_template_version: ocata
description: >
HOT template to created resources deployed by scenario004.

2
default_passwords.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2016-10-14
heat_template_version: ocata
description: Passwords we manage at the top level

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

@ -1,4 +1,4 @@
heat_template_version: 2016-10-14
heat_template_version: ocata
description: "
A fake OS::Neutron::Port stack which outputs fixed_ips and subnets based on

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

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: ocata
parameters:
image:
type: string

2
docker/firstboot/install_docker_agents.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: ocata
parameters:
DockerAgentImage:

2
docker/post.j2.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2016-10-14
heat_template_version: ocata
description: >
Post-deploy configuration steps via puppet for all roles,

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

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: ocata
description: >
OpenStack Neutron openvswitch service

2
docker/services/nova-compute.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: ocata
description: >
OpenStack containerized Nova Compute service

2
docker/services/nova-libvirt.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: ocata
description: >
OpenStack Libvirt Service

2
docker/services/services.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2016-10-14
heat_template_version: ocata
description: >
Utility stack to convert an array of services into a set of combined

2
extraconfig/all_nodes/mac_hostname.j2.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: ocata
description: >
Example extra config for cluster config

2
extraconfig/all_nodes/random_string.j2.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: ocata
description: >
Example extra config for cluster config

2
extraconfig/all_nodes/swap-partition.j2.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: ocata
description: >
Extra config to add swap space to nodes.

2
extraconfig/all_nodes/swap.j2.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: ocata
description: >
Extra config to add swap space to nodes.

2
extraconfig/post_deploy/default.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: ocata
description: 'Extra Post Deployment Config'
parameters:
servers:

2
extraconfig/post_deploy/example.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: ocata
description: >
Example extra config for post-deployment

2
extraconfig/post_deploy/example_run_on_update.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: ocata
description: >
Example extra config for post-deployment, this re-runs every update

2
extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: ocata
description: >
RHEL Registration and unregistration software deployments.

2
extraconfig/tasks/major_upgrade_ceilometer_wsgi_mitaka_newton.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: ocata
description: >
Software-config for ceilometer configuration under httpd during upgrades

2
extraconfig/tasks/major_upgrade_pacemaker.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2016-10-14
heat_template_version: ocata
description: 'Upgrade for Pacemaker deployments'
parameters:

2
extraconfig/tasks/major_upgrade_pacemaker_init.j2.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: ocata
description: 'Upgrade for Pacemaker deployments'
parameters:

2
extraconfig/tasks/mitaka_to_newton_aodh_data_migration.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: ocata
description: >
Software-config for performing aodh data migration

2
extraconfig/tasks/post_puppet_pacemaker.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: ocata
description: 'Post-Puppet Config for Pacemaker deployments'
parameters:

2
extraconfig/tasks/post_puppet_pacemaker_restart.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: ocata
description: 'Post-Puppet restart config for Pacemaker deployments'
parameters:

2
extraconfig/tasks/pre_puppet_pacemaker.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: ocata
description: 'Pre-Puppet Config for Pacemaker deployments'
parameters:

2
extraconfig/tasks/yum_update.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: ocata
description: >
Software-config for performing package updates using yum

2
extraconfig/tasks/yum_update_noop.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: ocata
description: 'No-op yum update task'
resources:

2
firstboot/os-net-config-mappings.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-10-15
heat_template_version: ocata
description: >
Configure os-net-config mappings for specific nodes

2
firstboot/userdata_default.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: ocata
description: >
This is a default no-op template which provides empty user-data

2
firstboot/userdata_dev_rsync.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: ocata
description: >
This is first boot configuration for development purposes. It allows

2
firstboot/userdata_example.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2014-10-16
heat_template_version: ocata
# NOTE: You don't need to pass the parameter explicitly from the
# parent template, it can be specified via the parameter_defaults

2
firstboot/userdata_heat_admin.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2016-10-14
heat_template_version: ocata
parameters:
# Can be overridden via parameter_defaults in the environment

2
hosts-config.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2016-10-14
heat_template_version: ocata
description: 'All Hosts Config'
parameters:

2
net-config-bond.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config with 2 bonded nics on a bridge.
parameters:

2
net-config-bridge.yaml
View File

@ -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.
parameters:

2
net-config-linux-bridge.yaml
View File

@ -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.
parameters:

2
net-config-noop.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: ocata
description: >
Software Config to no-op for os-net-config. Using this will allow you

2
net-config-static-bridge-with-external-dhcp.yaml
View File

@ -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 with a static IP address for the ctlplane network.
parameters:

2
net-config-static-bridge.yaml
View File

@ -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 with a static IP address for the ctlplane network.
parameters:

2
net-config-static.yaml
View File

@ -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.
parameters:

2
network/config/bond-with-vlans/ceph-storage.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config with 2 bonded nics on a bridge with VLANs attached for the ceph storage role.
parameters:

2
network/config/bond-with-vlans/cinder-storage.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config with 2 bonded nics on a bridge with VLANs attached for the cinder storage role.
parameters:

2
network/config/bond-with-vlans/compute-dpdk.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config with 2 bonded nics on a bridge with VLANs attached for the compute role.
parameters:

2
network/config/bond-with-vlans/compute.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config with 2 bonded nics on a bridge with VLANs attached for the compute role.
parameters:

2
network/config/bond-with-vlans/controller-no-external.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config with 2 bonded nics on a bridge with VLANs attached for the controller role.
parameters:

2
network/config/bond-with-vlans/controller-v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config with 2 bonded nics on a bridge with VLANs attached for the controller role with IPv6
on the External network. The IPv6 default route is on the External network, and the IPv4 default route is on the Control

2
network/config/bond-with-vlans/controller.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config with 2 bonded nics on a bridge with VLANs attached for the controller role.
parameters:

2
network/config/bond-with-vlans/swift-storage.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config with 2 bonded nics on a bridge with VLANs attached for the swift storage role.
parameters:

2
network/config/multiple-nics/ceph-storage.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config to configure multiple interfaces for the ceph storage role.
parameters:

2
network/config/multiple-nics/cinder-storage.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config to configure multiple interfaces for the cinder storage role.
parameters:

2
network/config/multiple-nics/compute-dvr.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config to configure multiple interfaces for the
compute role with external bridge for DVR.

2
network/config/multiple-nics/compute.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config to configure multiple interfaces for the compute role.
parameters:

2
network/config/multiple-nics/controller-v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config to configure multiple interfaces for the controller role with IPv6 on the External
network. The IPv6 default route is on the External network, and the IPv4 default route is on the Control Plane.

2
network/config/multiple-nics/controller.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config to configure multiple interfaces for the controller role.
parameters:

2
network/config/multiple-nics/swift-storage.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config to configure multiple interfaces for the swift storage role.
parameters:

2
network/config/single-nic-linux-bridge-vlans/ceph-storage.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config to configure VLANs for the ceph storage role.
parameters:

2
network/config/single-nic-linux-bridge-vlans/cinder-storage.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config to configure VLANs for the cinder storage role.
parameters:

2
network/config/single-nic-linux-bridge-vlans/compute.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config to configure VLANs for the compute role.
parameters:

2
network/config/single-nic-linux-bridge-vlans/controller-v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config to configure VLANs for the controller role with IPv6 on the External network. The
IPv6 default route is on the External network, and the IPv4 default route is on the Control Plane.

2
network/config/single-nic-linux-bridge-vlans/controller.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config to configure VLANs for the controller role.
parameters:

2
network/config/single-nic-linux-bridge-vlans/swift-storage.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config to configure VLANs for the swift storage role.
parameters:

2
network/config/single-nic-vlans/ceph-storage.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config to configure VLANs for the ceph storage role.
parameters:

2
network/config/single-nic-vlans/cinder-storage.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config to configure VLANs for the cinder storage role.
parameters:

2
network/config/single-nic-vlans/compute.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config to configure VLANs for the compute role.
parameters:

2
network/config/single-nic-vlans/controller-no-external.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config to configure VLANs for the controller role. No external IP is configured.
parameters:

2
network/config/single-nic-vlans/controller-v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config to configure VLANs for the controller role with IPv6 on the External network. The
IPv6 default route is on the External network, and the IPv4 default route is on the Control Plane.

2
network/config/single-nic-vlans/controller.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config to configure VLANs for the controller role.
parameters:

2
network/config/single-nic-vlans/swift-storage.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: '2016-10-14'
heat_template_version: ocata
description: >
Software Config to drive os-net-config to configure VLANs for the swift storage role.
parameters:

2
network/endpoints/endpoint_map.yaml
View File

@ -2,7 +2,7 @@
### This file is automatically generated from endpoint_data.yaml
### by the script build_endpoint_map.py
heat_template_version: '2015-04-30'
heat_template_version: ocata
description: A map of OpenStack endpoints. Since the endpoints are URLs,
we need to have brackets around IPv6 IP addresses. The inputs to these
parameters come from net_ip_uri_map, which will include these brackets

2
network/external.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: ocata
description: >
External network. Public traffic, Neutron l3router for floating IPs/SNAT, etc.

2
network/external_v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: ocata
description: >
External network. Public traffic, Neutron l3router for floating IPs/SNAT, etc.

2
network/internal_api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: ocata
description: >
Internal API network. Used for most APIs, Database, RPC.

2
network/internal_api_v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: ocata
description: >
Internal API network. Used for most APIs, Database, RPC.

2
network/management.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: ocata
description: >
Management network. System administration, SSH, DNS, NTP, etc. This network

2
network/management_v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: ocata
description: >
Management network. System administration, SSH, DNS, NTP, etc. This network

2
network/networks.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: ocata
description: Create networks to split out Overcloud traffic

2
network/ports/ctlplane_vip.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-10-15
heat_template_version: ocata
description: >
Creates a port for a VIP on the undercloud ctlplane network.

2
network/ports/external.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-10-15
heat_template_version: ocata
description: >
Creates a port on the external network. The IP address will be chosen

2
network/ports/external_from_pool.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-10-15
heat_template_version: ocata
description: >
Returns an IP from a network mapped list of IPs

2
network/ports/external_from_pool_v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-10-15
heat_template_version: ocata
description: >
Returns an IP from a network mapped list of IPs. This version is for IPv6

2
network/ports/external_v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-10-15
heat_template_version: ocata
description: >
Creates a port on the external network. The IP address will be chosen

2
network/ports/from_service.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: ocata
description: >
Returns an IP from a service mapped list of IPs

2
network/ports/from_service_v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: ocata
description: >
Returns an IP from a service mapped list of IPv6 IPs

2
network/ports/internal_api.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-10-15
heat_template_version: ocata
description: >
Creates a port on the internal_api network.

2
network/ports/internal_api_from_pool.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-10-15
heat_template_version: ocata
description: >
Returns an IP from a network mapped list of IPs

2
network/ports/internal_api_from_pool_v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-10-15
heat_template_version: ocata
description: >
Returns an IP from a network mapped list of IPs. This version is for IPv6

2
network/ports/internal_api_v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-10-15
heat_template_version: ocata
description: >
Creates a port on the internal_api network.

2
network/ports/management.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-10-15
heat_template_version: ocata
description: >
Creates a port on the management network. The IP address will be chosen

2
network/ports/management_from_pool.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-10-15
heat_template_version: ocata
description: >
Returns an IP from a network mapped list of IPs

2
network/ports/management_from_pool_v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-10-15
heat_template_version: ocata
description: >
Returns an IP from a network mapped list of IPs. This version is for IPv6

2
network/ports/management_v6.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-10-15
heat_template_version: ocata
description: >
Creates a port on the management network. The IP address will be chosen

2
network/ports/net_ip_list_map.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2016-10-14
heat_template_version: ocata
parameters:
ControlPlaneIpList:

2
network/ports/net_ip_map.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: ocata
parameters:
ControlPlaneIp:

2
network/ports/net_vip_map_external.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: 2015-04-30
heat_template_version: ocata
parameters:
# Set these via parameter defaults to configure external VIPs

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