openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Update the template_version alias for all the templates to pike."

Browse Source
This commit is contained in:
Jenkins 2017-05-20 00:07:38 +00:00 committed by Gerrit Code Review
commit ede56b7a8e
321 changed files with 321 additions and 321 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: ocata
heat_template_version: pike
description: >
Software Config to drive validations that occur on all nodes.

2
bootstrap-config.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: 'Bootstrap Config'
parameters:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
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: ocata
heat_template_version: pike
description: >
Software Config to drive os-net-config for a simple bridge configured

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack Core Service

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

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

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

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

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

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

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

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

2
ci/pingtests/tenantvm_floatingip.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
This template resides in tripleo-ci for Mitaka CI jobs only.

2
default_passwords.yaml
View File

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

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
parameters:
network:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: "
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: ocata
heat_template_version: pike
description: 'Deployed Server Bootstrap Config'

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: 'Deployed Server Bootstrap Config'

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
parameters:
image:
type: string

2
docker/docker-steps.j2
View File

@ -11,7 +11,7 @@
# primary role is: {{primary_role_name}}
{% set deploy_steps_max = 6 -%}
heat_template_version: ocata
heat_template_version: pike
description: >
Post-deploy configuration steps via puppet for all roles,

2
docker/firstboot/setup_docker_host.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
parameters:
DockerNamespace:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
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: ocata
heat_template_version: pike
description: >
MongoDB service deployment using puppet and docker

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
MySQL service deployment using puppet

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Redis services

2
docker/services/etcd.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized etcd services

2
docker/services/neutron-plugin-ml2.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Neutron ML2 Plugin configured with Puppet

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack containerized Nova Metadata service

2
docker/services/services.yaml
View File

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

2
docker/services/swift-ringbuilder.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
OpenStack Swift Ringbuilder

2
environments/contrail/contrail-nic-config-compute.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
Software Config to drive os-net-config to configure multiple interfaces

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

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

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

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

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: Template file to add a swap partition to a node.

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: Template file to add a swap file to a node.

2
extraconfig/nova_metadata/krb-service-principals.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: 'Generates the relevant service principals for a server'
parameters:

2
extraconfig/post_deploy/default.yaml
View File

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

2
extraconfig/post_deploy/example.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
description: >
RHEL Registration and unregistration software deployments.

2
extraconfig/pre_network/config_then_reboot.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
Do some configuration, then reboot - sometimes needed for early-boot

2
extraconfig/pre_network/host_config_and_reboot.role.j2.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
Do some configuration, then reboot - sometimes needed for early-boot

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
description: 'Pre-Puppet Config for Pacemaker deployments'
parameters:

2
extraconfig/tasks/ssh/host_public_key.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
This is a template which will fetch the ssh host public key.

2
extraconfig/tasks/ssh/known_hosts_config.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: 'SSH Known Hosts Config'
parameters:

2
extraconfig/tasks/yum_update.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
description: 'No-op yum update task'
resources:

2
firstboot/install_vrouter_kmod.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
parameters:
ContrailRepo:

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

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

2
firstboot/userdata_default.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
# 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: ocata
heat_template_version: pike
parameters:
# Can be overridden via parameter_defaults in the environment

2
firstboot/userdata_root_password.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
Uses cloud-init to enable root logins and set the root password.

2
hosts-config.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: 'All Hosts Config'
parameters:

2
net-config-bond.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
description: >
Software Config to drive os-net-config for a simple bridge.
parameters:

2
net-config-undercloud.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
description: >
Software Config to drive os-net-config for a simple bridge configured with a static IP address for the ctlplane network.
parameters:

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

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
description: >
Software Config to drive os-net-config to configure VLANs for the swift storage role.
parameters:

2
network/endpoints/build_endpoint_map.py
View File

@ -191,7 +191,7 @@ def template_endpoint_items(config):
def generate_endpoint_map_template(config):
return collections.OrderedDict([
('heat_template_version', 'ocata'),
('heat_template_version', 'pike'),
('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 '

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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
description: >
Internal API network. Used for most APIs, Database, RPC.

2
network/management.yaml
View File

@ -1,4 +1,4 @@
heat_template_version: ocata
heat_template_version: pike
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: ocata
heat_template_version: pike
description: >
Management network. System administration, SSH, DNS, NTP, etc. This network

2
network/networks.j2.yaml
View File

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

2
network/ports/ctlplane_vip.yaml
View File

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

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