Browse Source

Update the template_version alias for all the templates to pike.

Master is now the development branch for pike
changing the release alias name.

Change-Id: I938e4a983e361aefcaa0bd9a4226c296c5823127
changes/45/435345/7
Carlos Camacho 5 years ago
parent
commit
0a0e2ee629
  1. 2
      all-nodes-validation.yaml
  2. 2
      bootstrap-config.yaml
  3. 2
      ci/common/net-config-multinode-os-net-config.yaml
  4. 2
      ci/common/net-config-multinode.yaml
  5. 2
      ci/environments/multinode-core.yaml
  6. 2
      ci/pingtests/scenario001-multinode.yaml
  7. 2
      ci/pingtests/scenario002-multinode.yaml
  8. 2
      ci/pingtests/scenario003-multinode.yaml
  9. 2
      ci/pingtests/scenario004-multinode.yaml
  10. 2
      ci/pingtests/tenantvm_floatingip.yaml
  11. 2
      default_passwords.yaml
  12. 2
      deployed-server/ctlplane-port.yaml
  13. 2
      deployed-server/deployed-neutron-port.yaml
  14. 2
      deployed-server/deployed-server-bootstrap-centos.yaml
  15. 2
      deployed-server/deployed-server-bootstrap-rhel.yaml
  16. 2
      deployed-server/deployed-server.yaml
  17. 2
      docker/docker-steps.j2
  18. 2
      docker/firstboot/setup_docker_host.yaml
  19. 2
      docker/services/containers-common.yaml
  20. 2
      docker/services/database/mongodb.yaml
  21. 2
      docker/services/database/mysql.yaml
  22. 2
      docker/services/database/redis.yaml
  23. 2
      docker/services/etcd.yaml
  24. 2
      docker/services/neutron-plugin-ml2.yaml
  25. 2
      docker/services/nova-metadata.yaml
  26. 2
      docker/services/services.yaml
  27. 2
      docker/services/swift-ringbuilder.yaml
  28. 2
      environments/contrail/contrail-nic-config-compute.yaml
  29. 2
      extraconfig/all_nodes/mac_hostname.j2.yaml
  30. 2
      extraconfig/all_nodes/random_string.j2.yaml
  31. 2
      extraconfig/all_nodes/swap-partition.j2.yaml
  32. 2
      extraconfig/all_nodes/swap.j2.yaml
  33. 2
      extraconfig/nova_metadata/krb-service-principals.yaml
  34. 2
      extraconfig/post_deploy/default.yaml
  35. 2
      extraconfig/post_deploy/example.yaml
  36. 2
      extraconfig/post_deploy/example_run_on_update.yaml
  37. 2
      extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml
  38. 2
      extraconfig/pre_network/config_then_reboot.yaml
  39. 2
      extraconfig/pre_network/host_config_and_reboot.role.j2.yaml
  40. 2
      extraconfig/tasks/post_puppet_pacemaker.j2.yaml
  41. 2
      extraconfig/tasks/post_puppet_pacemaker_restart.yaml
  42. 2
      extraconfig/tasks/pre_puppet_pacemaker.yaml
  43. 2
      extraconfig/tasks/ssh/host_public_key.yaml
  44. 2
      extraconfig/tasks/ssh/known_hosts_config.yaml
  45. 2
      extraconfig/tasks/yum_update.yaml
  46. 2
      extraconfig/tasks/yum_update_noop.yaml
  47. 2
      firstboot/install_vrouter_kmod.yaml
  48. 2
      firstboot/os-net-config-mappings.yaml
  49. 2
      firstboot/userdata_default.yaml
  50. 2
      firstboot/userdata_dev_rsync.yaml
  51. 2
      firstboot/userdata_example.yaml
  52. 2
      firstboot/userdata_heat_admin.yaml
  53. 2
      firstboot/userdata_root_password.yaml
  54. 2
      hosts-config.yaml
  55. 2
      net-config-bond.yaml
  56. 2
      net-config-bridge.yaml
  57. 2
      net-config-linux-bridge.yaml
  58. 2
      net-config-noop.yaml
  59. 2
      net-config-static-bridge-with-external-dhcp.yaml
  60. 2
      net-config-static-bridge.yaml
  61. 2
      net-config-static.yaml
  62. 2
      net-config-undercloud.yaml
  63. 2
      network/config/bond-with-vlans/ceph-storage.yaml
  64. 2
      network/config/bond-with-vlans/cinder-storage.yaml
  65. 2
      network/config/bond-with-vlans/compute-dpdk.yaml
  66. 2
      network/config/bond-with-vlans/compute.yaml
  67. 2
      network/config/bond-with-vlans/controller-no-external.yaml
  68. 2
      network/config/bond-with-vlans/controller-v6.yaml
  69. 2
      network/config/bond-with-vlans/controller.yaml
  70. 2
      network/config/bond-with-vlans/swift-storage.yaml
  71. 2
      network/config/multiple-nics/ceph-storage.yaml
  72. 2
      network/config/multiple-nics/cinder-storage.yaml
  73. 2
      network/config/multiple-nics/compute-dvr.yaml
  74. 2
      network/config/multiple-nics/compute.yaml
  75. 2
      network/config/multiple-nics/controller-v6.yaml
  76. 2
      network/config/multiple-nics/controller.yaml
  77. 2
      network/config/multiple-nics/swift-storage.yaml
  78. 2
      network/config/single-nic-linux-bridge-vlans/ceph-storage.yaml
  79. 2
      network/config/single-nic-linux-bridge-vlans/cinder-storage.yaml
  80. 2
      network/config/single-nic-linux-bridge-vlans/compute.yaml
  81. 2
      network/config/single-nic-linux-bridge-vlans/controller-v6.yaml
  82. 2
      network/config/single-nic-linux-bridge-vlans/controller.yaml
  83. 2
      network/config/single-nic-linux-bridge-vlans/swift-storage.yaml
  84. 2
      network/config/single-nic-vlans/ceph-storage.yaml
  85. 2
      network/config/single-nic-vlans/cinder-storage.yaml
  86. 2
      network/config/single-nic-vlans/compute.yaml
  87. 2
      network/config/single-nic-vlans/controller-no-external.yaml
  88. 2
      network/config/single-nic-vlans/controller-v6.yaml
  89. 2
      network/config/single-nic-vlans/controller.yaml
  90. 2
      network/config/single-nic-vlans/swift-storage.yaml
  91. 2
      network/endpoints/build_endpoint_map.py
  92. 2
      network/endpoints/endpoint_map.yaml
  93. 2
      network/external.yaml
  94. 2
      network/external_v6.yaml
  95. 2
      network/internal_api.yaml
  96. 2
      network/internal_api_v6.yaml
  97. 2
      network/management.yaml
  98. 2
      network/management_v6.yaml
  99. 2
      network/networks.j2.yaml
  100. 2
      network/ports/ctlplane_vip.yaml

2
all-nodes-validation.yaml

@ -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

@ -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

@ -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

@ -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

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

2
ci/pingtests/scenario001-multinode.yaml

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

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

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

@ -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

@ -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

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

2
deployed-server/deployed-server.yaml

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

2
docker/docker-steps.j2

@ -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

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

2
docker/services/containers-common.yaml

@ -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

@ -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

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

2
docker/services/database/redis.yaml

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

2
docker/services/etcd.yaml

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

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

@ -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

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

2
docker/services/services.yaml

@ -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

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

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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

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

2
extraconfig/tasks/yum_update.yaml

@ -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

@ -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

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

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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

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

2
net-config-bond.yaml

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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 changed in this diff

Loading…
Cancel
Save