From c9991c2e31d1fa32360c57ebded1e61db7b9ea24 Mon Sep 17 00:00:00 2001 From: ramishra Date: Thu, 25 Mar 2021 16:52:04 +0530 Subject: [PATCH] Use 'wallaby' heat_template_version With I57047682cfa82ba6ca4affff54fab5216e9ba51c Heat has added a new template version for wallaby. This would allow us to use 2-argument variant of the ``if`` function that would allow for e.g. conditional definition of resource properties and help cleanup templates. If only two arguments are passed to ``if`` function, the entire enclosing item is removed when the condition is false. Change-Id: I25f981b60c6a66b39919adc38c02a051b6c51269 --- ci/common/ironic_standalone_post.yaml | 2 +- ci/common/vbmc_setup.yaml | 2 +- ci/environments/disable-unbound.yaml | 2 +- ci/environments/multinode-core.yaml | 2 +- common/deploy-steps.j2 | 2 +- common/services/role.role.j2.yaml | 2 +- config-download-software.yaml | 2 +- config-download-structured.yaml | 2 +- deployed-server/ctlplane-port.yaml | 2 +- deployed-server/deployed-neutron-port.yaml | 2 +- deployed-server/deployed-server-environment-output.yaml | 2 +- deployed-server/deployed-server.yaml | 2 +- deployment/aide/aide-baremetal-ansible.yaml | 2 +- deployment/aodh/aodh-api-container-puppet.yaml | 2 +- deployment/aodh/aodh-base.yaml | 2 +- deployment/aodh/aodh-evaluator-container-puppet.yaml | 2 +- deployment/aodh/aodh-listener-container-puppet.yaml | 2 +- deployment/aodh/aodh-notifier-container-puppet.yaml | 2 +- deployment/apache/apache-baremetal-puppet.j2.yaml | 2 +- deployment/auditd/auditd-baremetal-puppet.yaml | 2 +- deployment/backup-and-restore/rear-baremetal-ansible.yaml | 2 +- deployment/barbican/barbican-api-container-puppet.yaml | 2 +- deployment/barbican/barbican-backend-dogtag-puppet.yaml | 2 +- deployment/barbican/barbican-backend-kmip-puppet.yaml | 2 +- deployment/barbican/barbican-backend-pkcs11-crypto-puppet.yaml | 2 +- deployment/barbican/barbican-backend-simple-crypto-puppet.yaml | 2 +- deployment/barbican/barbican-client-puppet.yaml | 2 +- .../ceilometer/ceilometer-agent-central-container-puppet.yaml | 2 +- .../ceilometer/ceilometer-agent-compute-container-puppet.yaml | 2 +- .../ceilometer/ceilometer-agent-ipmi-container-puppet.yaml | 2 +- .../ceilometer-agent-notification-container-puppet.yaml | 2 +- deployment/ceilometer/ceilometer-base-container-puppet.yaml | 2 +- deployment/ceph-ansible/ceph-base.yaml | 2 +- deployment/ceph-ansible/ceph-client.yaml | 2 +- deployment/ceph-ansible/ceph-external.yaml | 2 +- deployment/ceph-ansible/ceph-grafana.yaml | 2 +- deployment/ceph-ansible/ceph-mds.yaml | 2 +- deployment/ceph-ansible/ceph-mgr.yaml | 2 +- deployment/ceph-ansible/ceph-mon.yaml | 2 +- deployment/ceph-ansible/ceph-nfs.yaml | 2 +- deployment/ceph-ansible/ceph-osd.yaml | 2 +- deployment/ceph-ansible/ceph-rbdmirror.yaml | 2 +- deployment/ceph-ansible/ceph-rgw.yaml | 2 +- deployment/cephadm/ceph-base.yaml | 2 +- deployment/cephadm/ceph-client.yaml | 2 +- deployment/cephadm/ceph-external.yaml | 2 +- deployment/cephadm/ceph-grafana.yaml | 2 +- deployment/cephadm/ceph-mds.yaml | 2 +- deployment/cephadm/ceph-mgr.yaml | 2 +- deployment/cephadm/ceph-mon.yaml | 2 +- deployment/cephadm/ceph-nfs.yaml | 2 +- deployment/cephadm/ceph-osd.yaml | 2 +- deployment/cephadm/ceph-rbdmirror.yaml | 2 +- deployment/cephadm/ceph-rgw.yaml | 2 +- deployment/certs/ca-certs-baremetal-puppet.yaml | 2 +- deployment/cinder/cinder-api-container-puppet.yaml | 2 +- deployment/cinder/cinder-backend-dellemc-powerflex-puppet.yaml | 2 +- deployment/cinder/cinder-backend-dellemc-powermax-puppet.yaml | 2 +- .../cinder/cinder-backend-dellemc-powerstore-puppet.yaml | 2 +- deployment/cinder/cinder-backend-dellemc-sc-puppet.yaml | 2 +- deployment/cinder/cinder-backend-dellemc-unity-puppet.yaml | 2 +- .../cinder/cinder-backend-dellemc-vmax-iscsi-puppet.yaml | 2 +- deployment/cinder/cinder-backend-dellemc-vnx-puppet.yaml | 2 +- .../cinder/cinder-backend-dellemc-xtremio-iscsi-puppet.yaml | 2 +- deployment/cinder/cinder-backend-dellemc-xtremio-puppet.yaml | 2 +- deployment/cinder/cinder-backend-dellsc-puppet.yaml | 2 +- deployment/cinder/cinder-backend-netapp-puppet.yaml | 2 +- deployment/cinder/cinder-backend-nvmeof-puppet.yaml | 2 +- deployment/cinder/cinder-backend-pure-puppet.yaml | 2 +- .../cinder/cinder-backend-veritas-hyperscale-puppet.yaml | 2 +- deployment/cinder/cinder-backup-container-puppet.yaml | 2 +- deployment/cinder/cinder-backup-pacemaker-puppet.yaml | 2 +- deployment/cinder/cinder-base.yaml | 2 +- deployment/cinder/cinder-common-container-puppet.yaml | 2 +- deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml | 2 +- deployment/cinder/cinder-scheduler-container-puppet.yaml | 2 +- deployment/cinder/cinder-volume-container-puppet.yaml | 2 +- deployment/cinder/cinder-volume-pacemaker-puppet.yaml | 2 +- deployment/clients/openstack-clients-baremetal-ansible.yaml | 2 +- .../container-image-prepare-baremetal-ansible.j2.yaml | 2 +- deployment/containers-common.yaml | 2 +- deployment/database/mysql-base.yaml | 2 +- deployment/database/mysql-client.yaml | 2 +- deployment/database/mysql-container-puppet.yaml | 2 +- deployment/database/mysql-pacemaker-puppet.yaml | 2 +- deployment/database/redis-base-puppet.yaml | 2 +- deployment/database/redis-container-puppet.yaml | 2 +- deployment/database/redis-pacemaker-puppet.yaml | 2 +- .../cavium/liquidio-compute-config-container-puppet.yaml | 2 +- .../cinder/cinder-backend-dellemc-vxflexos-puppet.yaml | 2 +- .../deprecated/cinder/cinder-backend-scaleio-puppet.yaml | 2 +- .../deprecated/keepalived/keepalived-container-puppet.yaml | 2 +- .../deprecated/mistral/mistral-api-container-puppet.yaml | 2 +- deployment/deprecated/mistral/mistral-base.yaml | 2 +- .../deprecated/mistral/mistral-engine-container-puppet.yaml | 2 +- .../mistral/mistral-event-engine-container-puppet.yaml | 2 +- .../deprecated/mistral/mistral-executor-container-puppet.yaml | 2 +- deployment/deprecated/multipathd-container.yaml | 2 +- .../deprecated/novajoin/ipaclient-baremetal-ansible.yaml | 2 +- deployment/deprecated/novajoin/novajoin-container-puppet.yaml | 2 +- deployment/deprecated/zaqar/zaqar-container-puppet.yaml | 2 +- deployment/etcd/etcd-container-puppet.yaml | 2 +- .../experimental/designate/designate-api-container-puppet.yaml | 2 +- deployment/experimental/designate/designate-base.yaml | 2 +- .../experimental/designate/designate-bind-container.yaml | 2 +- .../designate/designate-central-container-puppet.yaml | 2 +- .../designate/designate-mdns-container-puppet.yaml | 2 +- .../designate/designate-producer-container-puppet.yaml | 2 +- .../designate/designate-sink-container-puppet.yaml | 2 +- .../designate/designate-worker-container-puppet.yaml | 2 +- deployment/frr/frr-container-ansible.yaml | 2 +- deployment/glance/glance-api-container-puppet.yaml | 2 +- deployment/glance/glance-api-edge-container-puppet.yaml | 2 +- deployment/gnocchi/gnocchi-api-container-puppet.yaml | 2 +- deployment/gnocchi/gnocchi-base.yaml | 2 +- deployment/gnocchi/gnocchi-metricd-container-puppet.yaml | 2 +- deployment/gnocchi/gnocchi-statsd-container-puppet.yaml | 2 +- deployment/haproxy/haproxy-container-puppet.yaml | 2 +- deployment/haproxy/haproxy-edge-container-puppet.yaml | 2 +- deployment/haproxy/haproxy-internal-tls-certmonger.j2.yaml | 2 +- deployment/haproxy/haproxy-pacemaker-puppet.yaml | 2 +- deployment/haproxy/haproxy-public-tls-certmonger.yaml | 2 +- deployment/haproxy/haproxy-public-tls-inject.yaml | 2 +- deployment/heat/heat-api-cfn-container-puppet.yaml | 2 +- deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml | 2 +- deployment/heat/heat-api-container-puppet.yaml | 2 +- deployment/heat/heat-base-puppet.yaml | 2 +- deployment/heat/heat-engine-container-puppet.yaml | 2 +- deployment/horizon/horizon-container-puppet.yaml | 2 +- deployment/image-serve/image-serve-baremetal-ansible.yaml | 2 +- deployment/ipa/ipaservices-baremetal-ansible.yaml | 2 +- deployment/ipsec/ipsec-baremetal-ansible.yaml | 2 +- deployment/ironic/ironic-api-container-puppet.yaml | 2 +- deployment/ironic/ironic-base-puppet.yaml | 2 +- deployment/ironic/ironic-conductor-container-puppet.yaml | 2 +- deployment/ironic/ironic-inspector-container-puppet.yaml | 2 +- deployment/ironic/ironic-neutron-agent-container-puppet.yaml | 2 +- deployment/ironic/ironic-pxe-container-puppet.yaml | 2 +- deployment/iscsid/iscsid-container-puppet.yaml | 2 +- deployment/kernel/kernel-baremetal-ansible.yaml | 2 +- deployment/kernel/kernel-boot-params-baremetal-ansible.yaml | 2 +- deployment/keystone/keystone-container-puppet.yaml | 2 +- deployment/logging/files/barbican-api.yaml | 2 +- deployment/logging/files/glance-api.yaml | 2 +- deployment/logging/files/haproxy.yaml | 2 +- deployment/logging/files/heat-api-cfn.yaml | 2 +- deployment/logging/files/heat-api.yaml | 2 +- deployment/logging/files/heat-engine.yaml | 2 +- deployment/logging/files/keystone.yaml | 2 +- deployment/logging/files/neutron-api.yaml | 2 +- deployment/logging/files/neutron-common.yaml | 2 +- deployment/logging/files/nova-api.yaml | 2 +- deployment/logging/files/nova-common.yaml | 2 +- deployment/logging/files/nova-libvirt.yaml | 2 +- deployment/logging/files/nova-metadata.yaml | 2 +- deployment/logging/files/placement-api.yaml | 2 +- deployment/logging/rsyslog-baremetal-ansible.yaml | 2 +- deployment/logging/rsyslog-container-puppet.yaml | 2 +- deployment/logging/rsyslog-sidecar-container-puppet.yaml | 2 +- deployment/logging/stdout/barbican-api.yaml | 2 +- deployment/logging/stdout/glance-api.yaml | 2 +- deployment/logging/stdout/haproxy.yaml | 2 +- deployment/logging/stdout/heat-api-cfn.yaml | 2 +- deployment/logging/stdout/heat-api.yaml | 2 +- deployment/logging/stdout/heat-engine.yaml | 2 +- deployment/logging/stdout/keystone.yaml | 2 +- deployment/logging/stdout/neutron-common.yaml | 2 +- deployment/logging/stdout/nova-api.yaml | 2 +- deployment/logging/stdout/nova-common.yaml | 2 +- deployment/logging/stdout/nova-libvirt.yaml | 2 +- deployment/logging/stdout/nova-metadata.yaml | 2 +- deployment/logging/stdout/placement-api.yaml | 2 +- deployment/login-defs/login-defs-baremetal-ansible.yaml | 2 +- deployment/logrotate/logrotate-crond-container-puppet.yaml | 2 +- deployment/logrotate/tmpwatch-install.yaml | 2 +- deployment/manila/manila-api-container-puppet.yaml | 2 +- deployment/manila/manila-backend-cephfs.yaml | 2 +- deployment/manila/manila-backend-isilon.yaml | 2 +- deployment/manila/manila-backend-netapp.yaml | 2 +- deployment/manila/manila-backend-unity.yaml | 2 +- deployment/manila/manila-backend-vmax.yaml | 2 +- deployment/manila/manila-backend-vnx.yaml | 2 +- deployment/manila/manila-base.yaml | 2 +- deployment/manila/manila-scheduler-container-puppet.yaml | 2 +- deployment/manila/manila-share-common.yaml | 2 +- deployment/manila/manila-share-container-puppet.yaml | 2 +- deployment/manila/manila-share-pacemaker-puppet.yaml | 2 +- .../masquerade-networks-baremetal-puppet.yaml | 2 +- deployment/memcached/memcached-container-puppet.yaml | 2 +- deployment/messaging/rpc-qdrouterd-container-puppet.yaml | 2 +- deployment/metrics/collectd-container-ansible.yaml | 2 +- deployment/metrics/collectd-container-puppet.yaml | 2 +- deployment/metrics/qdr-container-ansible.yaml | 3 +-- deployment/metrics/qdr-container-puppet.yaml | 2 +- deployment/multipathd/multipathd-container-ansible.yaml | 2 +- .../neutron/neutron-agents-ib-config-container-puppet.yaml | 2 +- deployment/neutron/neutron-api-container-puppet.yaml | 2 +- deployment/neutron/neutron-base.yaml | 2 +- deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml | 2 +- .../neutron/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml | 2 +- .../neutron/neutron-bigswitch-agent-baremetal-puppet.yaml | 2 +- deployment/neutron/neutron-compute-plugin-nuage.yaml | 2 +- deployment/neutron/neutron-controller-plugin-nuage.yaml | 2 +- deployment/neutron/neutron-dhcp-container-puppet.yaml | 2 +- deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml | 2 +- deployment/neutron/neutron-l2gw-api-container-puppet.yaml | 2 +- deployment/neutron/neutron-l3-container-puppet.yaml | 2 +- .../neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml | 2 +- deployment/neutron/neutron-metadata-container-puppet.yaml | 2 +- deployment/neutron/neutron-mlnx-agent-container-puppet.yaml | 2 +- .../neutron/neutron-ovn-dpdk-config-container-puppet.yaml | 2 +- deployment/neutron/neutron-ovs-agent-container-puppet.yaml | 2 +- .../neutron/neutron-ovs-dpdk-agent-container-puppet.yaml | 2 +- .../neutron/neutron-plugin-ml2-ansible-container-puppet.yaml | 2 +- .../neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml | 2 +- deployment/neutron/neutron-plugin-ml2-container-puppet.yaml | 2 +- .../neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml | 2 +- deployment/neutron/neutron-plugin-ml2-nuage.yaml | 2 +- deployment/neutron/neutron-plugin-ml2-ovn.yaml | 2 +- deployment/neutron/neutron-plugin-ml2.yaml | 2 +- deployment/neutron/neutron-plugin-nsx-container-puppet.yaml | 2 +- deployment/neutron/neutron-plugin-nuage.yaml | 2 +- deployment/neutron/neutron-sfc-api-container-puppet.yaml | 2 +- deployment/neutron/neutron-sriov-agent-container-puppet.yaml | 2 +- deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml | 2 +- deployment/nova/nova-api-container-puppet.yaml | 2 +- deployment/nova/nova-apidb-client-puppet.yaml | 2 +- deployment/nova/nova-az-config.yaml | 2 +- deployment/nova/nova-base-puppet.yaml | 2 +- deployment/nova/nova-compute-common-container-puppet.yaml | 2 +- deployment/nova/nova-compute-container-puppet.yaml | 2 +- deployment/nova/nova-conductor-container-puppet.yaml | 2 +- deployment/nova/nova-db-client-puppet.yaml | 2 +- deployment/nova/nova-ironic-container-puppet.yaml | 2 +- deployment/nova/nova-libvirt-container-puppet.yaml | 2 +- deployment/nova/nova-libvirt-guests-container-puppet.yaml | 2 +- deployment/nova/nova-manager-container-puppet.yaml | 2 +- deployment/nova/nova-metadata-container-puppet.yaml | 2 +- deployment/nova/nova-migration-target-container-puppet.yaml | 2 +- deployment/nova/nova-scheduler-container-puppet.yaml | 2 +- deployment/nova/nova-vnc-proxy-container-puppet.yaml | 2 +- deployment/octavia/octavia-api-container-puppet.yaml | 2 +- deployment/octavia/octavia-base.yaml | 2 +- deployment/octavia/octavia-deployment-config.j2.yaml | 2 +- .../octavia/octavia-health-manager-container-puppet.yaml | 2 +- deployment/octavia/octavia-housekeeping-container-puppet.yaml | 2 +- deployment/octavia/octavia-worker-container-puppet.yaml | 2 +- deployment/octavia/providers/ovn-provider-config.yaml | 2 +- deployment/openvswitch/openvswitch-dpdk-baremetal-ansible.yaml | 2 +- .../openvswitch-dpdk-netcontrold-container-ansible.yaml | 2 +- deployment/ovn/ovn-controller-container-puppet.yaml | 2 +- deployment/ovn/ovn-dbs-container-puppet.yaml | 2 +- deployment/ovn/ovn-dbs-pacemaker-puppet.yaml | 2 +- deployment/ovn/ovn-metadata-container-puppet.yaml | 2 +- deployment/pacemaker/clustercheck-container-puppet.yaml | 2 +- deployment/pacemaker/compute-instanceha-baremetal-puppet.yaml | 2 +- deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml | 2 +- deployment/pacemaker/pacemaker-baremetal-puppet.yaml | 2 +- deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml | 2 +- deployment/placement/placement-api-container-puppet.yaml | 2 +- deployment/podman/podman-baremetal-ansible.yaml | 2 +- deployment/qdr/qdrouterd-container-puppet.yaml | 2 +- deployment/rabbitmq/rabbitmq-container-puppet.yaml | 2 +- .../rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml | 2 +- .../rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml | 2 +- .../rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml | 2 +- deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml | 2 +- .../rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml | 2 +- .../rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml | 2 +- deployment/rhsm/rhsm-baremetal-ansible.yaml | 2 +- deployment/securetty/securetty-baremetal-ansible.yaml | 2 +- deployment/snmp/snmp-baremetal-puppet.yaml | 2 +- deployment/sshd/sshd-baremetal-ansible.yaml | 2 +- deployment/sshd/sshd-baremetal-puppet.yaml | 2 +- deployment/swift/external-swift-proxy-baremetal-puppet.yaml | 2 +- deployment/swift/swift-base.yaml | 2 +- deployment/swift/swift-dispersion-baremetal-puppet.yaml | 2 +- deployment/swift/swift-proxy-container-puppet.yaml | 2 +- deployment/swift/swift-ringbuilder-container-puppet.yaml | 2 +- deployment/swift/swift-storage-container-puppet.yaml | 2 +- deployment/tests/test-container-volume.yaml | 2 +- deployment/time/ptp-baremetal-ansible.yaml | 2 +- deployment/time/timezone-baremetal-ansible.yaml | 2 +- deployment/timemaster/timemaster-baremetal-ansible.yaml | 2 +- deployment/timesync/chrony-baremetal-ansible.yaml | 2 +- deployment/tls/undercloud-remove-novajoin.yaml | 2 +- deployment/tls/undercloud-tls.yaml | 2 +- .../tripleo-firewall/tripleo-firewall-baremetal-ansible.yaml | 2 +- .../tripleo-packages/tripleo-packages-baremetal-puppet.yaml | 2 +- deployment/tuned/tuned-baremetal-ansible.yaml | 2 +- deployment/unbound/unbound-container-ansible.yaml | 2 +- deployment/undercloud/minion-rabbitmq-puppet.yaml | 2 +- deployment/undercloud/undercloud-upgrade.yaml | 2 +- .../validations/tripleo-validations-baremetal-ansible.yaml | 2 +- .../veritas-hyperscale-controller-baremetal-puppet.yaml | 2 +- deployment/vpp/vpp-baremetal-puppet.yaml | 2 +- extraconfig/all_nodes/swap-partition.j2.yaml | 2 +- extraconfig/all_nodes/swap.j2.yaml | 2 +- .../nova_metadata/krb-service-principals/role.role.j2.yaml | 2 +- extraconfig/post_deploy/default.yaml | 2 +- extraconfig/post_deploy/example.yaml | 2 +- extraconfig/post_deploy/example_run_on_update.yaml | 2 +- extraconfig/post_deploy/undercloud_post.yaml | 2 +- firstboot/conntectx3_streering.yaml | 2 +- firstboot/os-net-config-mappings.yaml | 2 +- firstboot/userdata_default.yaml | 2 +- firstboot/userdata_dev_rsync.yaml | 2 +- firstboot/userdata_example.yaml | 2 +- firstboot/userdata_heat_admin.yaml | 2 +- firstboot/userdata_root_password.yaml | 2 +- firstboot/userdata_timesync.yaml | 2 +- network/deployed_networks.yaml | 2 +- network/endpoints/build_endpoint_map.py | 2 +- network/endpoints/endpoint_map.yaml | 2 +- network/network.j2 | 2 +- network/networks.j2.yaml | 2 +- network/ovn_mac_addr_net.yaml | 2 +- network/ports/ctlplane_vip.yaml | 2 +- network/ports/deployed_port.j2 | 2 +- network/ports/deployed_vip_ctlplane.yaml | 2 +- network/ports/deployed_vip_port.j2 | 2 +- network/ports/from_service.yaml | 2 +- network/ports/from_service_v6.yaml | 2 +- network/ports/net_ip_list_map.j2.yaml | 2 +- network/ports/net_ip_map.j2.yaml | 2 +- network/ports/net_vip_map_external.j2.yaml | 2 +- network/ports/net_vip_map_external_v6.j2.yaml | 2 +- network/ports/noop.yaml | 2 +- network/ports/ovn_mac_addr_port.yaml | 2 +- network/ports/port.j2 | 2 +- network/ports/port_from_pool.j2 | 2 +- network/ports/vip.yaml | 2 +- network/ports/vip_v6.yaml | 2 +- network/service_net_map.j2.yaml | 2 +- overcloud.j2.yaml | 2 +- .../extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml | 2 +- puppet/extraconfig/pre_deploy/controller/multiple.yaml | 2 +- .../pre_deploy/controller/neutron-ml2-bigswitch.yaml | 2 +- puppet/extraconfig/pre_deploy/default.yaml | 2 +- puppet/extraconfig/pre_deploy/per_node.yaml | 2 +- puppet/extraconfig/tls/ca-inject.yaml | 2 +- puppet/role.role.j2.yaml | 2 +- .../heat_templates/2-linux-bonds-vlans-controller.yaml | 2 +- .../heat_templates/bond-vlans-controller.yaml | 2 +- .../nic_config_convert_samples/heat_templates/complex.yaml | 2 +- .../heat_templates/multiple-nics-vlans-controller.yaml | 2 +- .../single-nic-linux-bridge-vlans-controller.yaml | 2 +- .../heat_templates/single-nic-vlans-controller.yaml | 2 +- tools/yaml-validate.py | 2 +- 349 files changed, 349 insertions(+), 350 deletions(-) diff --git a/ci/common/ironic_standalone_post.yaml b/ci/common/ironic_standalone_post.yaml index d5849c1f60..ddf44ce8d8 100644 --- a/ci/common/ironic_standalone_post.yaml +++ b/ci/common/ironic_standalone_post.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby parameters: servers: diff --git a/ci/common/vbmc_setup.yaml b/ci/common/vbmc_setup.yaml index 068e429e4c..6fbf1bb531 100644 --- a/ci/common/vbmc_setup.yaml +++ b/ci/common/vbmc_setup.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby parameters: servers: diff --git a/ci/environments/disable-unbound.yaml b/ci/environments/disable-unbound.yaml index 0883645a99..5dc00dfaf8 100644 --- a/ci/environments/disable-unbound.yaml +++ b/ci/environments/disable-unbound.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Disable Unbound Service diff --git a/ci/environments/multinode-core.yaml b/ci/environments/multinode-core.yaml index b0b3676924..9dfec0c547 100644 --- a/ci/environments/multinode-core.yaml +++ b/ci/environments/multinode-core.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Core Service diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index 3237087ccd..b43984f186 100644 --- a/common/deploy-steps.j2 +++ b/common/deploy-steps.j2 @@ -24,7 +24,7 @@ {% set post_update_steps_max = 4 -%} {% set scale_steps_max = 1 -%} -heat_template_version: rocky +heat_template_version: wallaby description: > Post-deploy configuration steps via puppet for all roles, diff --git a/common/services/role.role.j2.yaml b/common/services/role.role.j2.yaml index 7cfff0b5bb..18d5ee7cf8 100644 --- a/common/services/role.role.j2.yaml +++ b/common/services/role.role.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Utility stack to convert an array of services into a set of combined diff --git a/config-download-software.yaml b/config-download-software.yaml index dde40356b2..09808bd352 100644 --- a/config-download-software.yaml +++ b/config-download-software.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby parameters: diff --git a/config-download-structured.yaml b/config-download-structured.yaml index 5b3ed61d5c..a192db6766 100644 --- a/config-download-structured.yaml +++ b/config-download-structured.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby parameters: diff --git a/deployed-server/ctlplane-port.yaml b/deployed-server/ctlplane-port.yaml index a351248fca..523a3bf9d3 100644 --- a/deployed-server/ctlplane-port.yaml +++ b/deployed-server/ctlplane-port.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby parameters: network: diff --git a/deployed-server/deployed-neutron-port.yaml b/deployed-server/deployed-neutron-port.yaml index 91c3c168db..9a9032d7d6 100644 --- a/deployed-server/deployed-neutron-port.yaml +++ b/deployed-server/deployed-neutron-port.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: " A fake OS::Neutron::Port stack which outputs fixed_ips and subnets based on diff --git a/deployed-server/deployed-server-environment-output.yaml b/deployed-server/deployed-server-environment-output.yaml index d9096dbf6b..b768c47b97 100644 --- a/deployed-server/deployed-server-environment-output.yaml +++ b/deployed-server/deployed-server-environment-output.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby parameters: RoleCounts: diff --git a/deployed-server/deployed-server.yaml b/deployed-server/deployed-server.yaml index 0ece475438..5e6b3e1a80 100644 --- a/deployed-server/deployed-server.yaml +++ b/deployed-server/deployed-server.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby parameters: image: type: string diff --git a/deployment/aide/aide-baremetal-ansible.yaml b/deployment/aide/aide-baremetal-ansible.yaml index ab9062d4c1..3f80ca7a8b 100644 --- a/deployment/aide/aide-baremetal-ansible.yaml +++ b/deployment/aide/aide-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Aide service configured with Ansible diff --git a/deployment/aodh/aodh-api-container-puppet.yaml b/deployment/aodh/aodh-api-container-puppet.yaml index 148671b221..ce5a4fe645 100644 --- a/deployment/aodh/aodh-api-container-puppet.yaml +++ b/deployment/aodh/aodh-api-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized aodh service diff --git a/deployment/aodh/aodh-base.yaml b/deployment/aodh/aodh-base.yaml index 60d78620ad..b6eeb9432b 100644 --- a/deployment/aodh/aodh-base.yaml +++ b/deployment/aodh/aodh-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Aodh service configured with Puppet diff --git a/deployment/aodh/aodh-evaluator-container-puppet.yaml b/deployment/aodh/aodh-evaluator-container-puppet.yaml index c227adabfa..f1497f1ae1 100644 --- a/deployment/aodh/aodh-evaluator-container-puppet.yaml +++ b/deployment/aodh/aodh-evaluator-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Aodh Evaluator service diff --git a/deployment/aodh/aodh-listener-container-puppet.yaml b/deployment/aodh/aodh-listener-container-puppet.yaml index 542b7c0076..e170747e58 100644 --- a/deployment/aodh/aodh-listener-container-puppet.yaml +++ b/deployment/aodh/aodh-listener-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Aodh Listener service diff --git a/deployment/aodh/aodh-notifier-container-puppet.yaml b/deployment/aodh/aodh-notifier-container-puppet.yaml index 4f60b85a94..ac56abd44d 100644 --- a/deployment/aodh/aodh-notifier-container-puppet.yaml +++ b/deployment/aodh/aodh-notifier-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Aodh Notifier service diff --git a/deployment/apache/apache-baremetal-puppet.j2.yaml b/deployment/apache/apache-baremetal-puppet.j2.yaml index 20257d6fee..1464538846 100644 --- a/deployment/apache/apache-baremetal-puppet.j2.yaml +++ b/deployment/apache/apache-baremetal-puppet.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Apache service configured with Puppet. Note this is typically included diff --git a/deployment/auditd/auditd-baremetal-puppet.yaml b/deployment/auditd/auditd-baremetal-puppet.yaml index c313c2ee02..dca594e4ba 100644 --- a/deployment/auditd/auditd-baremetal-puppet.yaml +++ b/deployment/auditd/auditd-baremetal-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > AuditD configured with Puppet diff --git a/deployment/backup-and-restore/rear-baremetal-ansible.yaml b/deployment/backup-and-restore/rear-baremetal-ansible.yaml index 6d5b1bd137..085ae1cb84 100644 --- a/deployment/backup-and-restore/rear-baremetal-ansible.yaml +++ b/deployment/backup-and-restore/rear-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Install and Configure ReaR diff --git a/deployment/barbican/barbican-api-container-puppet.yaml b/deployment/barbican/barbican-api-container-puppet.yaml index e5dab246a0..65e54e86c9 100644 --- a/deployment/barbican/barbican-api-container-puppet.yaml +++ b/deployment/barbican/barbican-api-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Barbican API service diff --git a/deployment/barbican/barbican-backend-dogtag-puppet.yaml b/deployment/barbican/barbican-backend-dogtag-puppet.yaml index e7b7a0abd2..65beb66f7d 100644 --- a/deployment/barbican/barbican-backend-dogtag-puppet.yaml +++ b/deployment/barbican/barbican-backend-dogtag-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Barbican API Dogtag backend configured with Puppet diff --git a/deployment/barbican/barbican-backend-kmip-puppet.yaml b/deployment/barbican/barbican-backend-kmip-puppet.yaml index c84c30a965..8e4a4a4c79 100644 --- a/deployment/barbican/barbican-backend-kmip-puppet.yaml +++ b/deployment/barbican/barbican-backend-kmip-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Barbican API KMIP backend configured with Puppet diff --git a/deployment/barbican/barbican-backend-pkcs11-crypto-puppet.yaml b/deployment/barbican/barbican-backend-pkcs11-crypto-puppet.yaml index 56fe320bf3..7c2675bd85 100644 --- a/deployment/barbican/barbican-backend-pkcs11-crypto-puppet.yaml +++ b/deployment/barbican/barbican-backend-pkcs11-crypto-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Barbican API PKCS#11 crypto backend configured with Puppet diff --git a/deployment/barbican/barbican-backend-simple-crypto-puppet.yaml b/deployment/barbican/barbican-backend-simple-crypto-puppet.yaml index 836723572b..036acd0816 100644 --- a/deployment/barbican/barbican-backend-simple-crypto-puppet.yaml +++ b/deployment/barbican/barbican-backend-simple-crypto-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Barbican API simple crypto backend configured with Puppet diff --git a/deployment/barbican/barbican-client-puppet.yaml b/deployment/barbican/barbican-client-puppet.yaml index 4e5e13c344..144ba383cc 100644 --- a/deployment/barbican/barbican-client-puppet.yaml +++ b/deployment/barbican/barbican-client-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Barbican client configuration diff --git a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml index c08fabcc05..ea3a24bcff 100644 --- a/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Ceilometer Agent Central service diff --git a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml index 7df7fd958e..5756fa1843 100644 --- a/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-compute-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Ceilometer Agent Compute service diff --git a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml index 2ab34d2cb2..d89f82edd6 100644 --- a/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-ipmi-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Ceilometer Agent Ipmi service diff --git a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml index 69a4d99287..b967d684a5 100644 --- a/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Ceilometer Agent Notification service diff --git a/deployment/ceilometer/ceilometer-base-container-puppet.yaml b/deployment/ceilometer/ceilometer-base-container-puppet.yaml index b9a4a3e7ee..b503e347f3 100644 --- a/deployment/ceilometer/ceilometer-base-container-puppet.yaml +++ b/deployment/ceilometer/ceilometer-base-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Ceilometer service configured with Puppet diff --git a/deployment/ceph-ansible/ceph-base.yaml b/deployment/ceph-ansible/ceph-base.yaml index fadf5dcad0..9cfa570ffd 100644 --- a/deployment/ceph-ansible/ceph-base.yaml +++ b/deployment/ceph-ansible/ceph-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph base service. Shared by all Ceph services. diff --git a/deployment/ceph-ansible/ceph-client.yaml b/deployment/ceph-ansible/ceph-client.yaml index 17f88dfef4..0fcbf73d90 100644 --- a/deployment/ceph-ansible/ceph-client.yaml +++ b/deployment/ceph-ansible/ceph-client.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph Client service. diff --git a/deployment/ceph-ansible/ceph-external.yaml b/deployment/ceph-ansible/ceph-external.yaml index 0a4a04af9e..7ad3cb77a1 100644 --- a/deployment/ceph-ansible/ceph-external.yaml +++ b/deployment/ceph-ansible/ceph-external.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph External service. diff --git a/deployment/ceph-ansible/ceph-grafana.yaml b/deployment/ceph-ansible/ceph-grafana.yaml index 4e36942d9f..752aa4c4ca 100644 --- a/deployment/ceph-ansible/ceph-grafana.yaml +++ b/deployment/ceph-ansible/ceph-grafana.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph Grafana service. diff --git a/deployment/ceph-ansible/ceph-mds.yaml b/deployment/ceph-ansible/ceph-mds.yaml index 32a21d27e9..eb04cd3027 100644 --- a/deployment/ceph-ansible/ceph-mds.yaml +++ b/deployment/ceph-ansible/ceph-mds.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph Metadata service. diff --git a/deployment/ceph-ansible/ceph-mgr.yaml b/deployment/ceph-ansible/ceph-mgr.yaml index fa1c2f3664..48558f19d8 100644 --- a/deployment/ceph-ansible/ceph-mgr.yaml +++ b/deployment/ceph-ansible/ceph-mgr.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph Manager service. diff --git a/deployment/ceph-ansible/ceph-mon.yaml b/deployment/ceph-ansible/ceph-mon.yaml index 4ad296e93b..1fd7088de1 100644 --- a/deployment/ceph-ansible/ceph-mon.yaml +++ b/deployment/ceph-ansible/ceph-mon.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph Monitor service. diff --git a/deployment/ceph-ansible/ceph-nfs.yaml b/deployment/ceph-ansible/ceph-nfs.yaml index e938de94b4..5c484273d4 100644 --- a/deployment/ceph-ansible/ceph-nfs.yaml +++ b/deployment/ceph-ansible/ceph-nfs.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph NFS Ganeshaservice. diff --git a/deployment/ceph-ansible/ceph-osd.yaml b/deployment/ceph-ansible/ceph-osd.yaml index d7c4311dc9..4569f02df2 100644 --- a/deployment/ceph-ansible/ceph-osd.yaml +++ b/deployment/ceph-ansible/ceph-osd.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph OSD service. diff --git a/deployment/ceph-ansible/ceph-rbdmirror.yaml b/deployment/ceph-ansible/ceph-rbdmirror.yaml index 4d5a3c2e42..d485484a3e 100644 --- a/deployment/ceph-ansible/ceph-rbdmirror.yaml +++ b/deployment/ceph-ansible/ceph-rbdmirror.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph RBD Mirror service. diff --git a/deployment/ceph-ansible/ceph-rgw.yaml b/deployment/ceph-ansible/ceph-rgw.yaml index 8d8848d707..fdf2983d2a 100644 --- a/deployment/ceph-ansible/ceph-rgw.yaml +++ b/deployment/ceph-ansible/ceph-rgw.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph RadosGW service. diff --git a/deployment/cephadm/ceph-base.yaml b/deployment/cephadm/ceph-base.yaml index 376e0c234d..2ac9b3e71c 100644 --- a/deployment/cephadm/ceph-base.yaml +++ b/deployment/cephadm/ceph-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph base service. Shared by all Ceph services. diff --git a/deployment/cephadm/ceph-client.yaml b/deployment/cephadm/ceph-client.yaml index c65a6f6ca4..29d54fcbd6 100644 --- a/deployment/cephadm/ceph-client.yaml +++ b/deployment/cephadm/ceph-client.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph Client service. diff --git a/deployment/cephadm/ceph-external.yaml b/deployment/cephadm/ceph-external.yaml index abad3d5fc6..c9a31b604c 100644 --- a/deployment/cephadm/ceph-external.yaml +++ b/deployment/cephadm/ceph-external.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph External service. diff --git a/deployment/cephadm/ceph-grafana.yaml b/deployment/cephadm/ceph-grafana.yaml index b13a0cc57c..166d9df3e7 100644 --- a/deployment/cephadm/ceph-grafana.yaml +++ b/deployment/cephadm/ceph-grafana.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph Grafana service. diff --git a/deployment/cephadm/ceph-mds.yaml b/deployment/cephadm/ceph-mds.yaml index 713a709ea7..5015298a3e 100644 --- a/deployment/cephadm/ceph-mds.yaml +++ b/deployment/cephadm/ceph-mds.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph Metadata service. diff --git a/deployment/cephadm/ceph-mgr.yaml b/deployment/cephadm/ceph-mgr.yaml index c9c79594ca..6c5bdecabf 100644 --- a/deployment/cephadm/ceph-mgr.yaml +++ b/deployment/cephadm/ceph-mgr.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph Manager service. diff --git a/deployment/cephadm/ceph-mon.yaml b/deployment/cephadm/ceph-mon.yaml index 6331169210..96625e0032 100644 --- a/deployment/cephadm/ceph-mon.yaml +++ b/deployment/cephadm/ceph-mon.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph Monitor service. diff --git a/deployment/cephadm/ceph-nfs.yaml b/deployment/cephadm/ceph-nfs.yaml index 3c841acdad..116a19b5fd 100644 --- a/deployment/cephadm/ceph-nfs.yaml +++ b/deployment/cephadm/ceph-nfs.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph NFS Ganeshaservice. diff --git a/deployment/cephadm/ceph-osd.yaml b/deployment/cephadm/ceph-osd.yaml index ca5da89144..e095ee2643 100644 --- a/deployment/cephadm/ceph-osd.yaml +++ b/deployment/cephadm/ceph-osd.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph OSD service. diff --git a/deployment/cephadm/ceph-rbdmirror.yaml b/deployment/cephadm/ceph-rbdmirror.yaml index 3bf7abc071..d3fac0a153 100644 --- a/deployment/cephadm/ceph-rbdmirror.yaml +++ b/deployment/cephadm/ceph-rbdmirror.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph RBD Mirror service. diff --git a/deployment/cephadm/ceph-rgw.yaml b/deployment/cephadm/ceph-rgw.yaml index 26422ac2c5..0a6e9893cc 100644 --- a/deployment/cephadm/ceph-rgw.yaml +++ b/deployment/cephadm/ceph-rgw.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Ceph RadosGW service. diff --git a/deployment/certs/ca-certs-baremetal-puppet.yaml b/deployment/certs/ca-certs-baremetal-puppet.yaml index 30483057d6..2246984ab8 100644 --- a/deployment/certs/ca-certs-baremetal-puppet.yaml +++ b/deployment/certs/ca-certs-baremetal-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > HAproxy service configured with Puppet diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index 74d823e40d..922f7d8643 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/deployment/cinder/cinder-api-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Cinder API service diff --git a/deployment/cinder/cinder-backend-dellemc-powerflex-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-powerflex-puppet.yaml index 6b5f544575..ed18055684 100644 --- a/deployment/cinder/cinder-backend-dellemc-powerflex-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-powerflex-puppet.yaml @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Cinder Dell EMC PowerFlex backend diff --git a/deployment/cinder/cinder-backend-dellemc-powermax-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-powermax-puppet.yaml index 794cb3edfd..d33e5df826 100644 --- a/deployment/cinder/cinder-backend-dellemc-powermax-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-powermax-puppet.yaml @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Cinder Dell EMC PowerMax backend diff --git a/deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml index b5e51bf014..68e3004228 100644 --- a/deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-powerstore-puppet.yaml @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Cinder Dell EMC PowerStore backend diff --git a/deployment/cinder/cinder-backend-dellemc-sc-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-sc-puppet.yaml index 9cae615cf3..abad21ab6a 100644 --- a/deployment/cinder/cinder-backend-dellemc-sc-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-sc-puppet.yaml @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Cinder Dell EMC Storage Center backend diff --git a/deployment/cinder/cinder-backend-dellemc-unity-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-unity-puppet.yaml index 5dde15c987..2229550043 100644 --- a/deployment/cinder/cinder-backend-dellemc-unity-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-unity-puppet.yaml @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Cinder Dell EMC Unity backend diff --git a/deployment/cinder/cinder-backend-dellemc-vmax-iscsi-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-vmax-iscsi-puppet.yaml index 3a14683eaa..305f73187b 100644 --- a/deployment/cinder/cinder-backend-dellemc-vmax-iscsi-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-vmax-iscsi-puppet.yaml @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Cinder Dell EMC VMAX iscsi backend diff --git a/deployment/cinder/cinder-backend-dellemc-vnx-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-vnx-puppet.yaml index daae7ee6e3..ea1d417dd6 100644 --- a/deployment/cinder/cinder-backend-dellemc-vnx-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-vnx-puppet.yaml @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Cinder Dell EMC VNX backend diff --git a/deployment/cinder/cinder-backend-dellemc-xtremio-iscsi-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-xtremio-iscsi-puppet.yaml index 4a4c6417cd..ff3c962ab7 100644 --- a/deployment/cinder/cinder-backend-dellemc-xtremio-iscsi-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-xtremio-iscsi-puppet.yaml @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Cinder Dell EMC XTREMIO Iscsi backend diff --git a/deployment/cinder/cinder-backend-dellemc-xtremio-puppet.yaml b/deployment/cinder/cinder-backend-dellemc-xtremio-puppet.yaml index e9d1d30736..2aa53c6436 100644 --- a/deployment/cinder/cinder-backend-dellemc-xtremio-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellemc-xtremio-puppet.yaml @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Cinder Dell EMC Xtremio backend diff --git a/deployment/cinder/cinder-backend-dellsc-puppet.yaml b/deployment/cinder/cinder-backend-dellsc-puppet.yaml index ee18480535..833fc3258d 100644 --- a/deployment/cinder/cinder-backend-dellsc-puppet.yaml +++ b/deployment/cinder/cinder-backend-dellsc-puppet.yaml @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Cinder Dell EMC Storage Center backend diff --git a/deployment/cinder/cinder-backend-netapp-puppet.yaml b/deployment/cinder/cinder-backend-netapp-puppet.yaml index 7376a0b44c..64d8609a6d 100644 --- a/deployment/cinder/cinder-backend-netapp-puppet.yaml +++ b/deployment/cinder/cinder-backend-netapp-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: Openstack Cinder Netapp backend diff --git a/deployment/cinder/cinder-backend-nvmeof-puppet.yaml b/deployment/cinder/cinder-backend-nvmeof-puppet.yaml index 80cefcf3f0..527f01d2df 100644 --- a/deployment/cinder/cinder-backend-nvmeof-puppet.yaml +++ b/deployment/cinder/cinder-backend-nvmeof-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Cinder NVMeOF backend diff --git a/deployment/cinder/cinder-backend-pure-puppet.yaml b/deployment/cinder/cinder-backend-pure-puppet.yaml index 9f8b4e8b8e..e83cca1f76 100644 --- a/deployment/cinder/cinder-backend-pure-puppet.yaml +++ b/deployment/cinder/cinder-backend-pure-puppet.yaml @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Cinder Pure Storage FlashArray backend diff --git a/deployment/cinder/cinder-backend-veritas-hyperscale-puppet.yaml b/deployment/cinder/cinder-backend-veritas-hyperscale-puppet.yaml index e586a9c16a..0f85047cf6 100644 --- a/deployment/cinder/cinder-backend-veritas-hyperscale-puppet.yaml +++ b/deployment/cinder/cinder-backend-veritas-hyperscale-puppet.yaml @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Veritas HyperScale backend diff --git a/deployment/cinder/cinder-backup-container-puppet.yaml b/deployment/cinder/cinder-backup-container-puppet.yaml index 6b17c84605..548ca78acb 100644 --- a/deployment/cinder/cinder-backup-container-puppet.yaml +++ b/deployment/cinder/cinder-backup-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Cinder Backup service diff --git a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml index 2f646e369b..5d231dd7cb 100644 --- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Cinder Backup service diff --git a/deployment/cinder/cinder-base.yaml b/deployment/cinder/cinder-base.yaml index 00eaaadef2..d6a7778b55 100644 --- a/deployment/cinder/cinder-base.yaml +++ b/deployment/cinder/cinder-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Cinder base service. Shared by all Cinder services. diff --git a/deployment/cinder/cinder-common-container-puppet.yaml b/deployment/cinder/cinder-common-container-puppet.yaml index c6ebddecaa..563a2538a7 100644 --- a/deployment/cinder/cinder-common-container-puppet.yaml +++ b/deployment/cinder/cinder-common-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Provides the list of common container volumes and environment used by diff --git a/deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml b/deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml index 38740d97bb..d235b6cb6c 100644 --- a/deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml +++ b/deployment/cinder/cinder-hpelefthand-iscsi-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Configure Cinder HPELeftHandISCSIDriver diff --git a/deployment/cinder/cinder-scheduler-container-puppet.yaml b/deployment/cinder/cinder-scheduler-container-puppet.yaml index 1bb95d6741..b5d6f29320 100644 --- a/deployment/cinder/cinder-scheduler-container-puppet.yaml +++ b/deployment/cinder/cinder-scheduler-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Cinder Scheduler service diff --git a/deployment/cinder/cinder-volume-container-puppet.yaml b/deployment/cinder/cinder-volume-container-puppet.yaml index 60fd6fa53f..3180201b55 100644 --- a/deployment/cinder/cinder-volume-container-puppet.yaml +++ b/deployment/cinder/cinder-volume-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Cinder Volume service diff --git a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml index a491e0b3e1..67a9d6ca7f 100644 --- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml +++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Cinder Volume service diff --git a/deployment/clients/openstack-clients-baremetal-ansible.yaml b/deployment/clients/openstack-clients-baremetal-ansible.yaml index a335bffc3e..a071e9ac15 100644 --- a/deployment/clients/openstack-clients-baremetal-ansible.yaml +++ b/deployment/clients/openstack-clients-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Install the OpenStack clients with puppet diff --git a/deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml b/deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml index 8ecf138a9e..5514198f67 100644 --- a/deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml +++ b/deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Prepare container images diff --git a/deployment/containers-common.yaml b/deployment/containers-common.yaml index 10765bae7a..1ce7a510fb 100644 --- a/deployment/containers-common.yaml +++ b/deployment/containers-common.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Contains a static list of common things necessary for containers diff --git a/deployment/database/mysql-base.yaml b/deployment/database/mysql-base.yaml index 0e70547256..bb6201ae2e 100644 --- a/deployment/database/mysql-base.yaml +++ b/deployment/database/mysql-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > MySQL service deployment using puppet diff --git a/deployment/database/mysql-client.yaml b/deployment/database/mysql-client.yaml index d88e29780f..4cd237ebdf 100644 --- a/deployment/database/mysql-client.yaml +++ b/deployment/database/mysql-client.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Mysql client settings diff --git a/deployment/database/mysql-container-puppet.yaml b/deployment/database/mysql-container-puppet.yaml index 6bad2bd670..ce0953b650 100644 --- a/deployment/database/mysql-container-puppet.yaml +++ b/deployment/database/mysql-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > MySQL service deployment using puppet diff --git a/deployment/database/mysql-pacemaker-puppet.yaml b/deployment/database/mysql-pacemaker-puppet.yaml index b92bbba76a..1e88eb7d48 100644 --- a/deployment/database/mysql-pacemaker-puppet.yaml +++ b/deployment/database/mysql-pacemaker-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > MySQL service deployment with pacemaker bundle diff --git a/deployment/database/redis-base-puppet.yaml b/deployment/database/redis-base-puppet.yaml index fa99a258b3..ec931feb96 100644 --- a/deployment/database/redis-base-puppet.yaml +++ b/deployment/database/redis-base-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Redis service configured with Puppet diff --git a/deployment/database/redis-container-puppet.yaml b/deployment/database/redis-container-puppet.yaml index 88c4f9a86e..5958c6abb9 100644 --- a/deployment/database/redis-container-puppet.yaml +++ b/deployment/database/redis-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Redis services diff --git a/deployment/database/redis-pacemaker-puppet.yaml b/deployment/database/redis-pacemaker-puppet.yaml index 0e70a85618..e64e8f0a17 100644 --- a/deployment/database/redis-pacemaker-puppet.yaml +++ b/deployment/database/redis-pacemaker-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Redis services diff --git a/deployment/deprecated/cavium/liquidio-compute-config-container-puppet.yaml b/deployment/deprecated/cavium/liquidio-compute-config-container-puppet.yaml index c5d5ec1aeb..544a729725 100644 --- a/deployment/deprecated/cavium/liquidio-compute-config-container-puppet.yaml +++ b/deployment/deprecated/cavium/liquidio-compute-config-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Liquidio compute service diff --git a/deployment/deprecated/cinder/cinder-backend-dellemc-vxflexos-puppet.yaml b/deployment/deprecated/cinder/cinder-backend-dellemc-vxflexos-puppet.yaml index 9ed50d1fe3..c119a23abd 100644 --- a/deployment/deprecated/cinder/cinder-backend-dellemc-vxflexos-puppet.yaml +++ b/deployment/deprecated/cinder/cinder-backend-dellemc-vxflexos-puppet.yaml @@ -16,7 +16,7 @@ # Use Cinder Dell EMC PowerFlex backend template defined in # cinder-backend-dellemc-powerflex-puppet.yaml. -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Cinder Dell EMC VxFlexOS backend diff --git a/deployment/deprecated/cinder/cinder-backend-scaleio-puppet.yaml b/deployment/deprecated/cinder/cinder-backend-scaleio-puppet.yaml index a370bd9173..f458e4a3f4 100644 --- a/deployment/deprecated/cinder/cinder-backend-scaleio-puppet.yaml +++ b/deployment/deprecated/cinder/cinder-backend-scaleio-puppet.yaml @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Cinder Dell EMC ScaleIO backend diff --git a/deployment/deprecated/keepalived/keepalived-container-puppet.yaml b/deployment/deprecated/keepalived/keepalived-container-puppet.yaml index 35ff4249ae..fa5ac05af0 100644 --- a/deployment/deprecated/keepalived/keepalived-container-puppet.yaml +++ b/deployment/deprecated/keepalived/keepalived-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > DEPRECATED - OpenStack containerized Keepalived service diff --git a/deployment/deprecated/mistral/mistral-api-container-puppet.yaml b/deployment/deprecated/mistral/mistral-api-container-puppet.yaml index 41e7fba902..4e6e221e79 100644 --- a/deployment/deprecated/mistral/mistral-api-container-puppet.yaml +++ b/deployment/deprecated/mistral/mistral-api-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Mistral API service diff --git a/deployment/deprecated/mistral/mistral-base.yaml b/deployment/deprecated/mistral/mistral-base.yaml index a782a439b1..a96152939b 100644 --- a/deployment/deprecated/mistral/mistral-base.yaml +++ b/deployment/deprecated/mistral/mistral-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Mistral base service. Shared for all Mistral services. diff --git a/deployment/deprecated/mistral/mistral-engine-container-puppet.yaml b/deployment/deprecated/mistral/mistral-engine-container-puppet.yaml index 202f7c609b..b9cbed75ce 100644 --- a/deployment/deprecated/mistral/mistral-engine-container-puppet.yaml +++ b/deployment/deprecated/mistral/mistral-engine-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Mistral Engine service diff --git a/deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml b/deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml index 87d76c8dcd..2efb457be8 100644 --- a/deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml +++ b/deployment/deprecated/mistral/mistral-event-engine-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Mistral Event Engine service diff --git a/deployment/deprecated/mistral/mistral-executor-container-puppet.yaml b/deployment/deprecated/mistral/mistral-executor-container-puppet.yaml index 94b340b5fe..97327575ec 100644 --- a/deployment/deprecated/mistral/mistral-executor-container-puppet.yaml +++ b/deployment/deprecated/mistral/mistral-executor-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Mistral Executor service diff --git a/deployment/deprecated/multipathd-container.yaml b/deployment/deprecated/multipathd-container.yaml index 92d919bdc9..5835f80896 100644 --- a/deployment/deprecated/multipathd-container.yaml +++ b/deployment/deprecated/multipathd-container.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Multipathd service diff --git a/deployment/deprecated/novajoin/ipaclient-baremetal-ansible.yaml b/deployment/deprecated/novajoin/ipaclient-baremetal-ansible.yaml index 70c87fa832..c6bf569005 100644 --- a/deployment/deprecated/novajoin/ipaclient-baremetal-ansible.yaml +++ b/deployment/deprecated/novajoin/ipaclient-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: Registers nodes with the IPA server diff --git a/deployment/deprecated/novajoin/novajoin-container-puppet.yaml b/deployment/deprecated/novajoin/novajoin-container-puppet.yaml index aea4c4af7a..12f6e62d74 100644 --- a/deployment/deprecated/novajoin/novajoin-container-puppet.yaml +++ b/deployment/deprecated/novajoin/novajoin-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized novajoin service diff --git a/deployment/deprecated/zaqar/zaqar-container-puppet.yaml b/deployment/deprecated/zaqar/zaqar-container-puppet.yaml index ef8dcc8722..6758915035 100644 --- a/deployment/deprecated/zaqar/zaqar-container-puppet.yaml +++ b/deployment/deprecated/zaqar/zaqar-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Zaqar services diff --git a/deployment/etcd/etcd-container-puppet.yaml b/deployment/etcd/etcd-container-puppet.yaml index 76e75b7bcc..1227811c42 100644 --- a/deployment/etcd/etcd-container-puppet.yaml +++ b/deployment/etcd/etcd-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Containerized etcd services diff --git a/deployment/experimental/designate/designate-api-container-puppet.yaml b/deployment/experimental/designate/designate-api-container-puppet.yaml index 29d444baf8..86fb6daa13 100644 --- a/deployment/experimental/designate/designate-api-container-puppet.yaml +++ b/deployment/experimental/designate/designate-api-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Designate API service diff --git a/deployment/experimental/designate/designate-base.yaml b/deployment/experimental/designate/designate-base.yaml index 5bd0e5cbb5..ca58f5f30d 100644 --- a/deployment/experimental/designate/designate-base.yaml +++ b/deployment/experimental/designate/designate-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Designate base service. Shared for all Designate services diff --git a/deployment/experimental/designate/designate-bind-container.yaml b/deployment/experimental/designate/designate-bind-container.yaml index 3fa9a92bfc..012b3cb342 100644 --- a/deployment/experimental/designate/designate-bind-container.yaml +++ b/deployment/experimental/designate/designate-bind-container.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized bind9 for designate diff --git a/deployment/experimental/designate/designate-central-container-puppet.yaml b/deployment/experimental/designate/designate-central-container-puppet.yaml index 6a5baa2bf2..5087fea44d 100644 --- a/deployment/experimental/designate/designate-central-container-puppet.yaml +++ b/deployment/experimental/designate/designate-central-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Designate Central service diff --git a/deployment/experimental/designate/designate-mdns-container-puppet.yaml b/deployment/experimental/designate/designate-mdns-container-puppet.yaml index 630d1d895f..4495a6f056 100644 --- a/deployment/experimental/designate/designate-mdns-container-puppet.yaml +++ b/deployment/experimental/designate/designate-mdns-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Designate MiniDNS service diff --git a/deployment/experimental/designate/designate-producer-container-puppet.yaml b/deployment/experimental/designate/designate-producer-container-puppet.yaml index e82dfc0e79..a84e560752 100644 --- a/deployment/experimental/designate/designate-producer-container-puppet.yaml +++ b/deployment/experimental/designate/designate-producer-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Designate Producer service diff --git a/deployment/experimental/designate/designate-sink-container-puppet.yaml b/deployment/experimental/designate/designate-sink-container-puppet.yaml index 37fc4490a7..9c5d85b577 100644 --- a/deployment/experimental/designate/designate-sink-container-puppet.yaml +++ b/deployment/experimental/designate/designate-sink-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Designate Sink service diff --git a/deployment/experimental/designate/designate-worker-container-puppet.yaml b/deployment/experimental/designate/designate-worker-container-puppet.yaml index 2f33df2f5e..665cf9d81a 100644 --- a/deployment/experimental/designate/designate-worker-container-puppet.yaml +++ b/deployment/experimental/designate/designate-worker-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Designate Worker service diff --git a/deployment/frr/frr-container-ansible.yaml b/deployment/frr/frr-container-ansible.yaml index 39c9cc89d1..f8e0e7b183 100644 --- a/deployment/frr/frr-container-ansible.yaml +++ b/deployment/frr/frr-container-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Configures FRR on the host diff --git a/deployment/glance/glance-api-container-puppet.yaml b/deployment/glance/glance-api-container-puppet.yaml index 996ffc85ef..f467f97fd7 100644 --- a/deployment/glance/glance-api-container-puppet.yaml +++ b/deployment/glance/glance-api-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Glance service configured with Puppet diff --git a/deployment/glance/glance-api-edge-container-puppet.yaml b/deployment/glance/glance-api-edge-container-puppet.yaml index 94242af46f..c9e9d2335b 100644 --- a/deployment/glance/glance-api-edge-container-puppet.yaml +++ b/deployment/glance/glance-api-edge-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Glance service for DCN/Edge configured with Puppet diff --git a/deployment/gnocchi/gnocchi-api-container-puppet.yaml b/deployment/gnocchi/gnocchi-api-container-puppet.yaml index 21b35067b0..5ab6ade6a6 100644 --- a/deployment/gnocchi/gnocchi-api-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-api-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized gnocchi service diff --git a/deployment/gnocchi/gnocchi-base.yaml b/deployment/gnocchi/gnocchi-base.yaml index e680dba9e3..b00fea39a6 100644 --- a/deployment/gnocchi/gnocchi-base.yaml +++ b/deployment/gnocchi/gnocchi-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Gnocchi service configured with Puppet diff --git a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml index 6d7250da6e..624d487108 100644 --- a/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-metricd-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Gnocchi Metricd service diff --git a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml index 18bb714a76..c3f46df687 100644 --- a/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml +++ b/deployment/gnocchi/gnocchi-statsd-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Gnocchi Statsd service diff --git a/deployment/haproxy/haproxy-container-puppet.yaml b/deployment/haproxy/haproxy-container-puppet.yaml index 8d83a48ab7..9ea67a7cf4 100644 --- a/deployment/haproxy/haproxy-container-puppet.yaml +++ b/deployment/haproxy/haproxy-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized HAproxy service diff --git a/deployment/haproxy/haproxy-edge-container-puppet.yaml b/deployment/haproxy/haproxy-edge-container-puppet.yaml index 729b91c64b..ba3244fc8f 100644 --- a/deployment/haproxy/haproxy-edge-container-puppet.yaml +++ b/deployment/haproxy/haproxy-edge-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized HAproxy service for DCN/Edge deployments diff --git a/deployment/haproxy/haproxy-internal-tls-certmonger.j2.yaml b/deployment/haproxy/haproxy-internal-tls-certmonger.j2.yaml index 26135cb129..e54a3c3281 100644 --- a/deployment/haproxy/haproxy-internal-tls-certmonger.j2.yaml +++ b/deployment/haproxy/haproxy-internal-tls-certmonger.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > HAProxy deployment with TLS enabled, powered by certmonger diff --git a/deployment/haproxy/haproxy-pacemaker-puppet.yaml b/deployment/haproxy/haproxy-pacemaker-puppet.yaml index 885da96e6b..8699c5af83 100644 --- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml +++ b/deployment/haproxy/haproxy-pacemaker-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized HAproxy service for pacemaker diff --git a/deployment/haproxy/haproxy-public-tls-certmonger.yaml b/deployment/haproxy/haproxy-public-tls-certmonger.yaml index 3f902ec309..735fd2b9a1 100644 --- a/deployment/haproxy/haproxy-public-tls-certmonger.yaml +++ b/deployment/haproxy/haproxy-public-tls-certmonger.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > HAProxy deployment with TLS enabled, powered by certmonger diff --git a/deployment/haproxy/haproxy-public-tls-inject.yaml b/deployment/haproxy/haproxy-public-tls-inject.yaml index 6f89dadd7a..2d3265526c 100644 --- a/deployment/haproxy/haproxy-public-tls-inject.yaml +++ b/deployment/haproxy/haproxy-public-tls-inject.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > HAProxy deployment with TLS enabled, with an injected certificate diff --git a/deployment/heat/heat-api-cfn-container-puppet.yaml b/deployment/heat/heat-api-cfn-container-puppet.yaml index 4a2c1a4b29..7445d5d0d4 100644 --- a/deployment/heat/heat-api-cfn-container-puppet.yaml +++ b/deployment/heat/heat-api-cfn-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Heat API CFN service diff --git a/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml b/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml index bfea00383e..8a318aebe6 100644 --- a/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml +++ b/deployment/heat/heat-api-cloudwatch-disabled-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Heat CloudWatch API service, disabled by default since Pike diff --git a/deployment/heat/heat-api-container-puppet.yaml b/deployment/heat/heat-api-container-puppet.yaml index 2e33a82804..424532535e 100644 --- a/deployment/heat/heat-api-container-puppet.yaml +++ b/deployment/heat/heat-api-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Heat API service diff --git a/deployment/heat/heat-base-puppet.yaml b/deployment/heat/heat-base-puppet.yaml index d40138dec8..674d06c5e1 100644 --- a/deployment/heat/heat-base-puppet.yaml +++ b/deployment/heat/heat-base-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Heat base service. Shared for all Heat services. diff --git a/deployment/heat/heat-engine-container-puppet.yaml b/deployment/heat/heat-engine-container-puppet.yaml index b0d05054d3..5ea5061597 100644 --- a/deployment/heat/heat-engine-container-puppet.yaml +++ b/deployment/heat/heat-engine-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Heat Engine service diff --git a/deployment/horizon/horizon-container-puppet.yaml b/deployment/horizon/horizon-container-puppet.yaml index 465f7bf601..6f58182ea0 100644 --- a/deployment/horizon/horizon-container-puppet.yaml +++ b/deployment/horizon/horizon-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Horizon service diff --git a/deployment/image-serve/image-serve-baremetal-ansible.yaml b/deployment/image-serve/image-serve-baremetal-ansible.yaml index df577adb6f..91c166b0e7 100644 --- a/deployment/image-serve/image-serve-baremetal-ansible.yaml +++ b/deployment/image-serve/image-serve-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Configures apache to serve container images on a host. diff --git a/deployment/ipa/ipaservices-baremetal-ansible.yaml b/deployment/ipa/ipaservices-baremetal-ansible.yaml index 947e3de44e..ea038e461a 100644 --- a/deployment/ipa/ipaservices-baremetal-ansible.yaml +++ b/deployment/ipa/ipaservices-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: Add services and subhosts to IPA server diff --git a/deployment/ipsec/ipsec-baremetal-ansible.yaml b/deployment/ipsec/ipsec-baremetal-ansible.yaml index 3acfd60e5c..0373189cf4 100644 --- a/deployment/ipsec/ipsec-baremetal-ansible.yaml +++ b/deployment/ipsec/ipsec-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: Enables IPSEC for the overcloud diff --git a/deployment/ironic/ironic-api-container-puppet.yaml b/deployment/ironic/ironic-api-container-puppet.yaml index 9895cb9ce6..559a6533bd 100644 --- a/deployment/ironic/ironic-api-container-puppet.yaml +++ b/deployment/ironic/ironic-api-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Ironic API service diff --git a/deployment/ironic/ironic-base-puppet.yaml b/deployment/ironic/ironic-base-puppet.yaml index 548038663f..30170ae461 100644 --- a/deployment/ironic/ironic-base-puppet.yaml +++ b/deployment/ironic/ironic-base-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Ironic services configured with Puppet diff --git a/deployment/ironic/ironic-conductor-container-puppet.yaml b/deployment/ironic/ironic-conductor-container-puppet.yaml index 25a850e686..4356541ec4 100644 --- a/deployment/ironic/ironic-conductor-container-puppet.yaml +++ b/deployment/ironic/ironic-conductor-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Ironic Conductor service diff --git a/deployment/ironic/ironic-inspector-container-puppet.yaml b/deployment/ironic/ironic-inspector-container-puppet.yaml index 5cefaf870f..50e7dc34df 100644 --- a/deployment/ironic/ironic-inspector-container-puppet.yaml +++ b/deployment/ironic/ironic-inspector-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Ironic Inspector service (EXPERIMENTAL) diff --git a/deployment/ironic/ironic-neutron-agent-container-puppet.yaml b/deployment/ironic/ironic-neutron-agent-container-puppet.yaml index 0e1deca15a..956aa5b7fd 100644 --- a/deployment/ironic/ironic-neutron-agent-container-puppet.yaml +++ b/deployment/ironic/ironic-neutron-agent-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack ironic-neutron-agent service diff --git a/deployment/ironic/ironic-pxe-container-puppet.yaml b/deployment/ironic/ironic-pxe-container-puppet.yaml index 0b3f10a236..6fa75921f6 100644 --- a/deployment/ironic/ironic-pxe-container-puppet.yaml +++ b/deployment/ironic/ironic-pxe-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Ironic PXE service diff --git a/deployment/iscsid/iscsid-container-puppet.yaml b/deployment/iscsid/iscsid-container-puppet.yaml index c35ee162e8..ae960d73c5 100644 --- a/deployment/iscsid/iscsid-container-puppet.yaml +++ b/deployment/iscsid/iscsid-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Iscsid service diff --git a/deployment/kernel/kernel-baremetal-ansible.yaml b/deployment/kernel/kernel-baremetal-ansible.yaml index 3de0e7f272..00d17dc889 100644 --- a/deployment/kernel/kernel-baremetal-ansible.yaml +++ b/deployment/kernel/kernel-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Load kernel modules with kmod and configure kernel options with sysctl. diff --git a/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml b/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml index 442ca7d98c..fe7c1fa1c2 100644 --- a/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml +++ b/deployment/kernel/kernel-boot-params-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: Host config and reboot service which configures Kernel Args and reboot diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index 303ae384fc..4db656789d 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Keystone service diff --git a/deployment/logging/files/barbican-api.yaml b/deployment/logging/files/barbican-api.yaml index 88e1c3a732..94b672e79c 100644 --- a/deployment/logging/files/barbican-api.yaml +++ b/deployment/logging/files/barbican-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Barbican API service diff --git a/deployment/logging/files/glance-api.yaml b/deployment/logging/files/glance-api.yaml index 2ba4ee2abf..2f0ab8a733 100644 --- a/deployment/logging/files/glance-api.yaml +++ b/deployment/logging/files/glance-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Glance API service diff --git a/deployment/logging/files/haproxy.yaml b/deployment/logging/files/haproxy.yaml index cf2b278811..d51be1866a 100644 --- a/deployment/logging/files/haproxy.yaml +++ b/deployment/logging/files/haproxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized HAProxy API service diff --git a/deployment/logging/files/heat-api-cfn.yaml b/deployment/logging/files/heat-api-cfn.yaml index 75825c3be5..a42e3c2990 100644 --- a/deployment/logging/files/heat-api-cfn.yaml +++ b/deployment/logging/files/heat-api-cfn.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Heat API CFN service diff --git a/deployment/logging/files/heat-api.yaml b/deployment/logging/files/heat-api.yaml index e3c3cf1af7..c235e7b8c1 100644 --- a/deployment/logging/files/heat-api.yaml +++ b/deployment/logging/files/heat-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Heat API service diff --git a/deployment/logging/files/heat-engine.yaml b/deployment/logging/files/heat-engine.yaml index bd34533ae9..4a98bd8e62 100644 --- a/deployment/logging/files/heat-engine.yaml +++ b/deployment/logging/files/heat-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Glance API service diff --git a/deployment/logging/files/keystone.yaml b/deployment/logging/files/keystone.yaml index 8be9770dc1..c623a27238 100644 --- a/deployment/logging/files/keystone.yaml +++ b/deployment/logging/files/keystone.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Keystone service diff --git a/deployment/logging/files/neutron-api.yaml b/deployment/logging/files/neutron-api.yaml index d14df545c4..76570c3a85 100644 --- a/deployment/logging/files/neutron-api.yaml +++ b/deployment/logging/files/neutron-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Neutron API service diff --git a/deployment/logging/files/neutron-common.yaml b/deployment/logging/files/neutron-common.yaml index 437ffa0f3e..76a9b94f44 100644 --- a/deployment/logging/files/neutron-common.yaml +++ b/deployment/logging/files/neutron-common.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Neutron service diff --git a/deployment/logging/files/nova-api.yaml b/deployment/logging/files/nova-api.yaml index 716d436b55..d417fada83 100644 --- a/deployment/logging/files/nova-api.yaml +++ b/deployment/logging/files/nova-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Template for nova-api's logging to files diff --git a/deployment/logging/files/nova-common.yaml b/deployment/logging/files/nova-common.yaml index 2901e8b5aa..321376467c 100644 --- a/deployment/logging/files/nova-common.yaml +++ b/deployment/logging/files/nova-common.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Template for nova's logging to files diff --git a/deployment/logging/files/nova-libvirt.yaml b/deployment/logging/files/nova-libvirt.yaml index 03f8b13563..c06aabc2ef 100644 --- a/deployment/logging/files/nova-libvirt.yaml +++ b/deployment/logging/files/nova-libvirt.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Nova libvirt service diff --git a/deployment/logging/files/nova-metadata.yaml b/deployment/logging/files/nova-metadata.yaml index b5d58baf0d..71095359e8 100644 --- a/deployment/logging/files/nova-metadata.yaml +++ b/deployment/logging/files/nova-metadata.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Template for nova-metadata's logging to files diff --git a/deployment/logging/files/placement-api.yaml b/deployment/logging/files/placement-api.yaml index 3143adfc7b..780296c886 100644 --- a/deployment/logging/files/placement-api.yaml +++ b/deployment/logging/files/placement-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Template for placement's logging to files diff --git a/deployment/logging/rsyslog-baremetal-ansible.yaml b/deployment/logging/rsyslog-baremetal-ansible.yaml index 852ca1583f..63cf38479a 100644 --- a/deployment/logging/rsyslog-baremetal-ansible.yaml +++ b/deployment/logging/rsyslog-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Install and start rsyslog. diff --git a/deployment/logging/rsyslog-container-puppet.yaml b/deployment/logging/rsyslog-container-puppet.yaml index c8bb0b6d64..386149316f 100644 --- a/deployment/logging/rsyslog-container-puppet.yaml +++ b/deployment/logging/rsyslog-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Containerized rsyslogd service for purposes of centralized log collection diff --git a/deployment/logging/rsyslog-sidecar-container-puppet.yaml b/deployment/logging/rsyslog-sidecar-container-puppet.yaml index cb2d915de6..15401d971a 100644 --- a/deployment/logging/rsyslog-sidecar-container-puppet.yaml +++ b/deployment/logging/rsyslog-sidecar-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Containerized rsyslog-sidecar service diff --git a/deployment/logging/stdout/barbican-api.yaml b/deployment/logging/stdout/barbican-api.yaml index 9309ceba62..c8097dd0fe 100644 --- a/deployment/logging/stdout/barbican-api.yaml +++ b/deployment/logging/stdout/barbican-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Barbican service diff --git a/deployment/logging/stdout/glance-api.yaml b/deployment/logging/stdout/glance-api.yaml index 2c8b6636cf..56ec1aa139 100644 --- a/deployment/logging/stdout/glance-api.yaml +++ b/deployment/logging/stdout/glance-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Glance API service diff --git a/deployment/logging/stdout/haproxy.yaml b/deployment/logging/stdout/haproxy.yaml index 49f03369f4..529562446b 100644 --- a/deployment/logging/stdout/haproxy.yaml +++ b/deployment/logging/stdout/haproxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized HAProxy API service diff --git a/deployment/logging/stdout/heat-api-cfn.yaml b/deployment/logging/stdout/heat-api-cfn.yaml index 858b8169ed..40ac69d2da 100644 --- a/deployment/logging/stdout/heat-api-cfn.yaml +++ b/deployment/logging/stdout/heat-api-cfn.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Heat API CFN service diff --git a/deployment/logging/stdout/heat-api.yaml b/deployment/logging/stdout/heat-api.yaml index 653a3f07e0..d6a779e6d7 100644 --- a/deployment/logging/stdout/heat-api.yaml +++ b/deployment/logging/stdout/heat-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Heat API service diff --git a/deployment/logging/stdout/heat-engine.yaml b/deployment/logging/stdout/heat-engine.yaml index c8df4ad1de..a41bac20fb 100644 --- a/deployment/logging/stdout/heat-engine.yaml +++ b/deployment/logging/stdout/heat-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Glance API service diff --git a/deployment/logging/stdout/keystone.yaml b/deployment/logging/stdout/keystone.yaml index f72790f64b..d1dd335b77 100644 --- a/deployment/logging/stdout/keystone.yaml +++ b/deployment/logging/stdout/keystone.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Keystone service diff --git a/deployment/logging/stdout/neutron-common.yaml b/deployment/logging/stdout/neutron-common.yaml index 45bf7eda9f..64193b6acb 100644 --- a/deployment/logging/stdout/neutron-common.yaml +++ b/deployment/logging/stdout/neutron-common.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Neutron API service diff --git a/deployment/logging/stdout/nova-api.yaml b/deployment/logging/stdout/nova-api.yaml index fe9ac3e048..74f8a4c42a 100644 --- a/deployment/logging/stdout/nova-api.yaml +++ b/deployment/logging/stdout/nova-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Template for nova-api's logging to stdout diff --git a/deployment/logging/stdout/nova-common.yaml b/deployment/logging/stdout/nova-common.yaml index eace46c31b..652cfcd662 100644 --- a/deployment/logging/stdout/nova-common.yaml +++ b/deployment/logging/stdout/nova-common.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Template for nova's logging to stdout diff --git a/deployment/logging/stdout/nova-libvirt.yaml b/deployment/logging/stdout/nova-libvirt.yaml index afd00fb9aa..722786826f 100644 --- a/deployment/logging/stdout/nova-libvirt.yaml +++ b/deployment/logging/stdout/nova-libvirt.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Nova libvirt service diff --git a/deployment/logging/stdout/nova-metadata.yaml b/deployment/logging/stdout/nova-metadata.yaml index b96dcf760d..10375a7038 100644 --- a/deployment/logging/stdout/nova-metadata.yaml +++ b/deployment/logging/stdout/nova-metadata.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Template for nova-metadata's logging to stdout diff --git a/deployment/logging/stdout/placement-api.yaml b/deployment/logging/stdout/placement-api.yaml index 57ef410969..a8f6b05fab 100644 --- a/deployment/logging/stdout/placement-api.yaml +++ b/deployment/logging/stdout/placement-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Template for placement's logging to stdout diff --git a/deployment/login-defs/login-defs-baremetal-ansible.yaml b/deployment/login-defs/login-defs-baremetal-ansible.yaml index 193e66c7ba..e1e4d9799c 100644 --- a/deployment/login-defs/login-defs-baremetal-ansible.yaml +++ b/deployment/login-defs/login-defs-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Configure login.defs values diff --git a/deployment/logrotate/logrotate-crond-container-puppet.yaml b/deployment/logrotate/logrotate-crond-container-puppet.yaml index 3568a3df56..a1f11efd91 100644 --- a/deployment/logrotate/logrotate-crond-container-puppet.yaml +++ b/deployment/logrotate/logrotate-crond-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Containerized logrotate with crond for containerized service logs rotation diff --git a/deployment/logrotate/tmpwatch-install.yaml b/deployment/logrotate/tmpwatch-install.yaml index fa8f1628f0..ca3d3bb803 100644 --- a/deployment/logrotate/tmpwatch-install.yaml +++ b/deployment/logrotate/tmpwatch-install.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Install tmpwatch diff --git a/deployment/manila/manila-api-container-puppet.yaml b/deployment/manila/manila-api-container-puppet.yaml index 1a1cb063e9..e17cc65b64 100644 --- a/deployment/manila/manila-api-container-puppet.yaml +++ b/deployment/manila/manila-api-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Manila API service diff --git a/deployment/manila/manila-backend-cephfs.yaml b/deployment/manila/manila-backend-cephfs.yaml index fc1b8170c6..11290d8d5b 100644 --- a/deployment/manila/manila-backend-cephfs.yaml +++ b/deployment/manila/manila-backend-cephfs.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Manila Cephfs backend diff --git a/deployment/manila/manila-backend-isilon.yaml b/deployment/manila/manila-backend-isilon.yaml index b6600dd2e0..2b7f1a0f74 100644 --- a/deployment/manila/manila-backend-isilon.yaml +++ b/deployment/manila/manila-backend-isilon.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Manila isilon backend. diff --git a/deployment/manila/manila-backend-netapp.yaml b/deployment/manila/manila-backend-netapp.yaml index 28162680c0..b1a4cadd41 100644 --- a/deployment/manila/manila-backend-netapp.yaml +++ b/deployment/manila/manila-backend-netapp.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Manila netapp backend. diff --git a/deployment/manila/manila-backend-unity.yaml b/deployment/manila/manila-backend-unity.yaml index d5ddaa2810..436e13203a 100644 --- a/deployment/manila/manila-backend-unity.yaml +++ b/deployment/manila/manila-backend-unity.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Manila unity backend. diff --git a/deployment/manila/manila-backend-vmax.yaml b/deployment/manila/manila-backend-vmax.yaml index 18d254a8f1..44565bdadd 100644 --- a/deployment/manila/manila-backend-vmax.yaml +++ b/deployment/manila/manila-backend-vmax.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Manila vmax backend. diff --git a/deployment/manila/manila-backend-vnx.yaml b/deployment/manila/manila-backend-vnx.yaml index 3940591f6c..6da09ddc0d 100644 --- a/deployment/manila/manila-backend-vnx.yaml +++ b/deployment/manila/manila-backend-vnx.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Manila VNX backend. diff --git a/deployment/manila/manila-base.yaml b/deployment/manila/manila-base.yaml index 98dd2c21b5..474978b2fd 100644 --- a/deployment/manila/manila-base.yaml +++ b/deployment/manila/manila-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Manila base service. Shared by manila-api/scheduler/share services diff --git a/deployment/manila/manila-scheduler-container-puppet.yaml b/deployment/manila/manila-scheduler-container-puppet.yaml index 3a42522a47..dc97e53b4e 100644 --- a/deployment/manila/manila-scheduler-container-puppet.yaml +++ b/deployment/manila/manila-scheduler-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Manila Scheduler service diff --git a/deployment/manila/manila-share-common.yaml b/deployment/manila/manila-share-common.yaml index 8a71e602f0..0efa0bbd03 100644 --- a/deployment/manila/manila-share-common.yaml +++ b/deployment/manila/manila-share-common.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Provides the list of Docker volumes and environment to be used by the diff --git a/deployment/manila/manila-share-container-puppet.yaml b/deployment/manila/manila-share-container-puppet.yaml index 9828b095b0..80197300af 100644 --- a/deployment/manila/manila-share-container-puppet.yaml +++ b/deployment/manila/manila-share-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Manila Share service diff --git a/deployment/manila/manila-share-pacemaker-puppet.yaml b/deployment/manila/manila-share-pacemaker-puppet.yaml index 545243b675..b3ebcd8531 100644 --- a/deployment/manila/manila-share-pacemaker-puppet.yaml +++ b/deployment/manila/manila-share-pacemaker-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Manila Share service diff --git a/deployment/masquerade-networks/masquerade-networks-baremetal-puppet.yaml b/deployment/masquerade-networks/masquerade-networks-baremetal-puppet.yaml index 1d87ddafed..8a7a26e39b 100644 --- a/deployment/masquerade-networks/masquerade-networks-baremetal-puppet.yaml +++ b/deployment/masquerade-networks/masquerade-networks-baremetal-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Configure TripleO Masquerade networks with Puppet. diff --git a/deployment/memcached/memcached-container-puppet.yaml b/deployment/memcached/memcached-container-puppet.yaml index 9de4fdb4b7..33be646f92 100644 --- a/deployment/memcached/memcached-container-puppet.yaml +++ b/deployment/memcached/memcached-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Memcached services diff --git a/deployment/messaging/rpc-qdrouterd-container-puppet.yaml b/deployment/messaging/rpc-qdrouterd-container-puppet.yaml index a230cda174..a09002a19f 100644 --- a/deployment/messaging/rpc-qdrouterd-container-puppet.yaml +++ b/deployment/messaging/rpc-qdrouterd-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Qpid dispatch router service diff --git a/deployment/metrics/collectd-container-ansible.yaml b/deployment/metrics/collectd-container-ansible.yaml index 1218d891fd..a6953065d2 100644 --- a/deployment/metrics/collectd-container-ansible.yaml +++ b/deployment/metrics/collectd-container-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: Configure a test role to use ansible diff --git a/deployment/metrics/collectd-container-puppet.yaml b/deployment/metrics/collectd-container-puppet.yaml index ae59c63784..4ee212e12b 100644 --- a/deployment/metrics/collectd-container-puppet.yaml +++ b/deployment/metrics/collectd-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Containerized collectd service diff --git a/deployment/metrics/qdr-container-ansible.yaml b/deployment/metrics/qdr-container-ansible.yaml index b0bdfe1d43..b4e622f683 100644 --- a/deployment/metrics/qdr-container-ansible.yaml +++ b/deployment/metrics/qdr-container-ansible.yaml @@ -1,5 +1,4 @@ ---- -heat_template_version: rocky +heat_template_version: wallaby description: > Qpid dispatch router service for metrics and monitoring purposes diff --git a/deployment/metrics/qdr-container-puppet.yaml b/deployment/metrics/qdr-container-puppet.yaml index 61854a9936..365d0d86ef 100644 --- a/deployment/metrics/qdr-container-puppet.yaml +++ b/deployment/metrics/qdr-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Qpid dispatch router service for metrics and monitoring purposes diff --git a/deployment/multipathd/multipathd-container-ansible.yaml b/deployment/multipathd/multipathd-container-ansible.yaml index b5d8ae7b16..1169c52385 100644 --- a/deployment/multipathd/multipathd-container-ansible.yaml +++ b/deployment/multipathd/multipathd-container-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Multipathd service diff --git a/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml b/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml index bf6de4802a..97e729ccf8 100644 --- a/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml +++ b/deployment/neutron/neutron-agents-ib-config-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Neutron MLNX IB config service diff --git a/deployment/neutron/neutron-api-container-puppet.yaml b/deployment/neutron/neutron-api-container-puppet.yaml index 68ebe3d6c0..88a47c0676 100644 --- a/deployment/neutron/neutron-api-container-puppet.yaml +++ b/deployment/neutron/neutron-api-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Neutron API service diff --git a/deployment/neutron/neutron-base.yaml b/deployment/neutron/neutron-base.yaml index 0edd615c6f..5f55606bb3 100644 --- a/deployment/neutron/neutron-base.yaml +++ b/deployment/neutron/neutron-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Neutron base service. Shared for all Neutron agents. diff --git a/deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml b/deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml index 6896428b93..eea36aad52 100644 --- a/deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml +++ b/deployment/neutron/neutron-bgpvpn-api-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > BGPVPN API service configured with Puppet diff --git a/deployment/neutron/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml b/deployment/neutron/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml index 184356d1d7..8c301de65b 100644 --- a/deployment/neutron/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml +++ b/deployment/neutron/neutron-bgpvpn-bagpipe-baremetal-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Bagpipe Driver configured with Puppet diff --git a/deployment/neutron/neutron-bigswitch-agent-baremetal-puppet.yaml b/deployment/neutron/neutron-bigswitch-agent-baremetal-puppet.yaml index e8eb92c6f9..cec501a424 100644 --- a/deployment/neutron/neutron-bigswitch-agent-baremetal-puppet.yaml +++ b/deployment/neutron/neutron-bigswitch-agent-baremetal-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Installs bigswitch agent and enables the services diff --git a/deployment/neutron/neutron-compute-plugin-nuage.yaml b/deployment/neutron/neutron-compute-plugin-nuage.yaml index 23cc2d9cf0..62f202bfca 100644 --- a/deployment/neutron/neutron-compute-plugin-nuage.yaml +++ b/deployment/neutron/neutron-compute-plugin-nuage.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Neutron Compute Nuage plugin diff --git a/deployment/neutron/neutron-controller-plugin-nuage.yaml b/deployment/neutron/neutron-controller-plugin-nuage.yaml index 03d8acbc0b..b118414cc9 100644 --- a/deployment/neutron/neutron-controller-plugin-nuage.yaml +++ b/deployment/neutron/neutron-controller-plugin-nuage.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Neutron Nuage VRS diff --git a/deployment/neutron/neutron-dhcp-container-puppet.yaml b/deployment/neutron/neutron-dhcp-container-puppet.yaml index 1771fe3917..98d5e67272 100644 --- a/deployment/neutron/neutron-dhcp-container-puppet.yaml +++ b/deployment/neutron/neutron-dhcp-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Neutron DHCP service diff --git a/deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml b/deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml index 59183ec916..e6c65d0966 100644 --- a/deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml +++ b/deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > L2 Gateway agent configured with Puppet diff --git a/deployment/neutron/neutron-l2gw-api-container-puppet.yaml b/deployment/neutron/neutron-l2gw-api-container-puppet.yaml index a13110a72b..47381eadc3 100644 --- a/deployment/neutron/neutron-l2gw-api-container-puppet.yaml +++ b/deployment/neutron/neutron-l2gw-api-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Containerized L2GW Service Plugin diff --git a/deployment/neutron/neutron-l3-container-puppet.yaml b/deployment/neutron/neutron-l3-container-puppet.yaml index 5bf3699fdb..b805d99dd2 100644 --- a/deployment/neutron/neutron-l3-container-puppet.yaml +++ b/deployment/neutron/neutron-l3-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Neutron L3 agent diff --git a/deployment/neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml b/deployment/neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml index 3a0b9abaf1..f109bf6c1d 100644 --- a/deployment/neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml +++ b/deployment/neutron/neutron-linuxbridge-agent-baremetal-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Neutron Linuxbridge agent configured with Puppet. diff --git a/deployment/neutron/neutron-metadata-container-puppet.yaml b/deployment/neutron/neutron-metadata-container-puppet.yaml index 399e0cd179..1fef6b27a4 100644 --- a/deployment/neutron/neutron-metadata-container-puppet.yaml +++ b/deployment/neutron/neutron-metadata-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Neutron Metadata agent diff --git a/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml b/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml index a4604a7249..4022b603d6 100644 --- a/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-mlnx-agent-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Neutron MLNX service diff --git a/deployment/neutron/neutron-ovn-dpdk-config-container-puppet.yaml b/deployment/neutron/neutron-ovn-dpdk-config-container-puppet.yaml index 052f5f16f1..3f8f4a92b9 100644 --- a/deployment/neutron/neutron-ovn-dpdk-config-container-puppet.yaml +++ b/deployment/neutron/neutron-ovn-dpdk-config-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Neutron ML2/OVN DPDK Configured with puppet diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml index 89fb781d5d..0b92ebeeaf 100644 --- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Neutron openvswitch service diff --git a/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml index 1d178d610e..21fc289ea3 100644 --- a/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-ovs-dpdk-agent-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Neutron OVS DPDK configured with Puppet for Compute Role (Containerized) diff --git a/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml b/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml index 9ab174bebe..6cc81f9ddc 100644 --- a/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml +++ b/deployment/neutron/neutron-plugin-ml2-ansible-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Neutron ML2 networking-ansible Plugin (Docker) diff --git a/deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml b/deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml index 01996ab051..28f1d58780 100644 --- a/deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml +++ b/deployment/neutron/neutron-plugin-ml2-cisco-vts-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > VTS Controller Settings for Neutron ML2 Plugin (Docker) diff --git a/deployment/neutron/neutron-plugin-ml2-container-puppet.yaml b/deployment/neutron/neutron-plugin-ml2-container-puppet.yaml index d19b0808b9..819b2bece3 100644 --- a/deployment/neutron/neutron-plugin-ml2-container-puppet.yaml +++ b/deployment/neutron/neutron-plugin-ml2-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Neutron ML2 Plugin configured with Puppet diff --git a/deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml b/deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml index e7072f2344..66a4d3c391 100644 --- a/deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml +++ b/deployment/neutron/neutron-plugin-ml2-mlnx-sdn-assist-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > MLNX SDN configuration assist for Neutron ML2 Plugin. diff --git a/deployment/neutron/neutron-plugin-ml2-nuage.yaml b/deployment/neutron/neutron-plugin-ml2-nuage.yaml index ee6718d01f..2254d5a712 100644 --- a/deployment/neutron/neutron-plugin-ml2-nuage.yaml +++ b/deployment/neutron/neutron-plugin-ml2-nuage.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Neutron ML2/Nuage plugin configured with Puppet diff --git a/deployment/neutron/neutron-plugin-ml2-ovn.yaml b/deployment/neutron/neutron-plugin-ml2-ovn.yaml index 248f069ea2..a2e881f2cd 100644 --- a/deployment/neutron/neutron-plugin-ml2-ovn.yaml +++ b/deployment/neutron/neutron-plugin-ml2-ovn.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Neutron ML2/OVN plugin configured with Puppet diff --git a/deployment/neutron/neutron-plugin-ml2.yaml b/deployment/neutron/neutron-plugin-ml2.yaml index 3eadacdd8a..bb435c4ccb 100644 --- a/deployment/neutron/neutron-plugin-ml2.yaml +++ b/deployment/neutron/neutron-plugin-ml2.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Neutron ML2 Plugin configured with Puppet diff --git a/deployment/neutron/neutron-plugin-nsx-container-puppet.yaml b/deployment/neutron/neutron-plugin-nsx-container-puppet.yaml index 08f0003bed..72cb659f63 100644 --- a/deployment/neutron/neutron-plugin-nsx-container-puppet.yaml +++ b/deployment/neutron/neutron-plugin-nsx-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Neutron NSX Plugin configured with Puppet diff --git a/deployment/neutron/neutron-plugin-nuage.yaml b/deployment/neutron/neutron-plugin-nuage.yaml index 995e076bd3..255c054bdf 100644 --- a/deployment/neutron/neutron-plugin-nuage.yaml +++ b/deployment/neutron/neutron-plugin-nuage.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Neutron Nuage plugin diff --git a/deployment/neutron/neutron-sfc-api-container-puppet.yaml b/deployment/neutron/neutron-sfc-api-container-puppet.yaml index cc107bb248..9834284dcc 100644 --- a/deployment/neutron/neutron-sfc-api-container-puppet.yaml +++ b/deployment/neutron/neutron-sfc-api-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > SFC API service configured with Puppet diff --git a/deployment/neutron/neutron-sriov-agent-container-puppet.yaml b/deployment/neutron/neutron-sriov-agent-container-puppet.yaml index c45e2e9099..fae29fe59b 100644 --- a/deployment/neutron/neutron-sriov-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-sriov-agent-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Neutron SR-IOV service diff --git a/deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml b/deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml index 7ca37a04e2..d4f11f0953 100644 --- a/deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml +++ b/deployment/neutron/neutron-vpp-agent-baremetal-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Neutron ML2/VPP agent configured with Puppet diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml index bc36059e80..c8f84b0101 100644 --- a/deployment/nova/nova-api-container-puppet.yaml +++ b/deployment/nova/nova-api-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Nova API service diff --git a/deployment/nova/nova-apidb-client-puppet.yaml b/deployment/nova/nova-apidb-client-puppet.yaml index 01fd0ee634..e127cae520 100644 --- a/deployment/nova/nova-apidb-client-puppet.yaml +++ b/deployment/nova/nova-apidb-client-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Nova database client service. diff --git a/deployment/nova/nova-az-config.yaml b/deployment/nova/nova-az-config.yaml index 0f8cae64c4..69d61e83f9 100644 --- a/deployment/nova/nova-az-config.yaml +++ b/deployment/nova/nova-az-config.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Configuration of Nova Availability Zones in the overcloud diff --git a/deployment/nova/nova-base-puppet.yaml b/deployment/nova/nova-base-puppet.yaml index 8b573b72ae..2023a745b7 100644 --- a/deployment/nova/nova-base-puppet.yaml +++ b/deployment/nova/nova-base-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Nova base service. Shared for all Nova services. diff --git a/deployment/nova/nova-compute-common-container-puppet.yaml b/deployment/nova/nova-compute-common-container-puppet.yaml index aac6182192..c170ff0cd9 100644 --- a/deployment/nova/nova-compute-common-container-puppet.yaml +++ b/deployment/nova/nova-compute-common-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Contains a static list of common things necessary for nova-compute containers diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml index b65bad4ade..e8548e2f47 100644 --- a/deployment/nova/nova-compute-container-puppet.yaml +++ b/deployment/nova/nova-compute-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Nova Compute service diff --git a/deployment/nova/nova-conductor-container-puppet.yaml b/deployment/nova/nova-conductor-container-puppet.yaml index 5aef55cfa1..eae55dac9c 100644 --- a/deployment/nova/nova-conductor-container-puppet.yaml +++ b/deployment/nova/nova-conductor-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Nova Conductor service diff --git a/deployment/nova/nova-db-client-puppet.yaml b/deployment/nova/nova-db-client-puppet.yaml index 0502a061ff..79a978e831 100644 --- a/deployment/nova/nova-db-client-puppet.yaml +++ b/deployment/nova/nova-db-client-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Nova database client service. diff --git a/deployment/nova/nova-ironic-container-puppet.yaml b/deployment/nova/nova-ironic-container-puppet.yaml index 1043e6559c..4bd9940a46 100644 --- a/deployment/nova/nova-ironic-container-puppet.yaml +++ b/deployment/nova/nova-ironic-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Nova Ironic Compute service diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml index cb53604fac..95e43bc12c 100644 --- a/deployment/nova/nova-libvirt-container-puppet.yaml +++ b/deployment/nova/nova-libvirt-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Libvirt Service diff --git a/deployment/nova/nova-libvirt-guests-container-puppet.yaml b/deployment/nova/nova-libvirt-guests-container-puppet.yaml index 7f006a704b..be66f75c90 100644 --- a/deployment/nova/nova-libvirt-guests-container-puppet.yaml +++ b/deployment/nova/nova-libvirt-guests-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Configure libvirt-guests diff --git a/deployment/nova/nova-manager-container-puppet.yaml b/deployment/nova/nova-manager-container-puppet.yaml index 379d756672..24faf07474 100644 --- a/deployment/nova/nova-manager-container-puppet.yaml +++ b/deployment/nova/nova-manager-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized nova-manage runner service diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml index 45f6697b22..73050b3e76 100644 --- a/deployment/nova/nova-metadata-container-puppet.yaml +++ b/deployment/nova/nova-metadata-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Nova Metadata service diff --git a/deployment/nova/nova-migration-target-container-puppet.yaml b/deployment/nova/nova-migration-target-container-puppet.yaml index 3b7dbe6d2c..d409c840fb 100644 --- a/deployment/nova/nova-migration-target-container-puppet.yaml +++ b/deployment/nova/nova-migration-target-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Nova Migration Target service diff --git a/deployment/nova/nova-scheduler-container-puppet.yaml b/deployment/nova/nova-scheduler-container-puppet.yaml index cc3c96fc47..c821c371e0 100644 --- a/deployment/nova/nova-scheduler-container-puppet.yaml +++ b/deployment/nova/nova-scheduler-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Nova Scheduler service diff --git a/deployment/nova/nova-vnc-proxy-container-puppet.yaml b/deployment/nova/nova-vnc-proxy-container-puppet.yaml index 7f1b8c006e..b2c622483c 100644 --- a/deployment/nova/nova-vnc-proxy-container-puppet.yaml +++ b/deployment/nova/nova-vnc-proxy-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Nova Vncproxy service diff --git a/deployment/octavia/octavia-api-container-puppet.yaml b/deployment/octavia/octavia-api-container-puppet.yaml index a8f3076e42..0fccdf2aa5 100644 --- a/deployment/octavia/octavia-api-container-puppet.yaml +++ b/deployment/octavia/octavia-api-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Octavia service configured with Puppet diff --git a/deployment/octavia/octavia-base.yaml b/deployment/octavia/octavia-base.yaml index d9ca25a361..a5a7bb3149 100644 --- a/deployment/octavia/octavia-base.yaml +++ b/deployment/octavia/octavia-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Octavia base service. Shared for all Octavia services diff --git a/deployment/octavia/octavia-deployment-config.j2.yaml b/deployment/octavia/octavia-deployment-config.j2.yaml index 37f8beaba4..6c174a3a66 100644 --- a/deployment/octavia/octavia-deployment-config.j2.yaml +++ b/deployment/octavia/octavia-deployment-config.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby {%- set octavia_standalone=[] -%} {%- for role in roles if 'standalone' in role.tags -%} {% if octavia_standalone.append('1') %}{% endif %} diff --git a/deployment/octavia/octavia-health-manager-container-puppet.yaml b/deployment/octavia/octavia-health-manager-container-puppet.yaml index de811dfc92..7de27f06d7 100644 --- a/deployment/octavia/octavia-health-manager-container-puppet.yaml +++ b/deployment/octavia/octavia-health-manager-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Octavia health-manager service configured with Puppet diff --git a/deployment/octavia/octavia-housekeeping-container-puppet.yaml b/deployment/octavia/octavia-housekeeping-container-puppet.yaml index f1f2689cff..d7e578edb9 100644 --- a/deployment/octavia/octavia-housekeeping-container-puppet.yaml +++ b/deployment/octavia/octavia-housekeeping-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Octavia service configured with Puppet diff --git a/deployment/octavia/octavia-worker-container-puppet.yaml b/deployment/octavia/octavia-worker-container-puppet.yaml index 9a500f2d91..20eb1fffe3 100644 --- a/deployment/octavia/octavia-worker-container-puppet.yaml +++ b/deployment/octavia/octavia-worker-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Octavia worker service configured with Puppet diff --git a/deployment/octavia/providers/ovn-provider-config.yaml b/deployment/octavia/providers/ovn-provider-config.yaml index 40de1fc81a..88ef1ee2cd 100644 --- a/deployment/octavia/providers/ovn-provider-config.yaml +++ b/deployment/octavia/providers/ovn-provider-config.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby parameters: EndpointMap: diff --git a/deployment/openvswitch/openvswitch-dpdk-baremetal-ansible.yaml b/deployment/openvswitch/openvswitch-dpdk-baremetal-ansible.yaml index 29c6dad7db..81658a3fb3 100644 --- a/deployment/openvswitch/openvswitch-dpdk-baremetal-ansible.yaml +++ b/deployment/openvswitch/openvswitch-dpdk-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Open vSwitch Configuration diff --git a/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml b/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml index 96cadb4230..6c25fbbb8c 100644 --- a/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml +++ b/deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > netcontrold configuration for ovs-dpdk diff --git a/deployment/ovn/ovn-controller-container-puppet.yaml b/deployment/ovn/ovn-controller-container-puppet.yaml index e01166401f..c2c1529b9d 100644 --- a/deployment/ovn/ovn-controller-container-puppet.yaml +++ b/deployment/ovn/ovn-controller-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Ovn Controller agent. diff --git a/deployment/ovn/ovn-dbs-container-puppet.yaml b/deployment/ovn/ovn-dbs-container-puppet.yaml index 0afdd6f6b4..a2cfedbabb 100644 --- a/deployment/ovn/ovn-dbs-container-puppet.yaml +++ b/deployment/ovn/ovn-dbs-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Ovn DBs service diff --git a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml index c320fd9ad0..d1441ddb9b 100644 --- a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml +++ b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized OVN DBs service managed by pacemaker diff --git a/deployment/ovn/ovn-metadata-container-puppet.yaml b/deployment/ovn/ovn-metadata-container-puppet.yaml index 1a649c025c..3a79b48e38 100644 --- a/deployment/ovn/ovn-metadata-container-puppet.yaml +++ b/deployment/ovn/ovn-metadata-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized OVN Metadata agent diff --git a/deployment/pacemaker/clustercheck-container-puppet.yaml b/deployment/pacemaker/clustercheck-container-puppet.yaml index 4baa11b883..a10f4984f1 100644 --- a/deployment/pacemaker/clustercheck-container-puppet.yaml +++ b/deployment/pacemaker/clustercheck-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > MySQL HA clustercheck service deployment using puppet diff --git a/deployment/pacemaker/compute-instanceha-baremetal-puppet.yaml b/deployment/pacemaker/compute-instanceha-baremetal-puppet.yaml index cce042e83e..89e9849d8a 100644 --- a/deployment/pacemaker/compute-instanceha-baremetal-puppet.yaml +++ b/deployment/pacemaker/compute-instanceha-baremetal-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Compute InstanceHA services configured with Puppet diff --git a/deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml b/deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml index 16d79ff2ab..108a8840dc 100644 --- a/deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml +++ b/deployment/pacemaker/ovn-dbs-baremetal-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OVN databases configured with puppet in HA mode diff --git a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml index 20fabfb4e6..de6864f033 100644 --- a/deployment/pacemaker/pacemaker-baremetal-puppet.yaml +++ b/deployment/pacemaker/pacemaker-baremetal-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Pacemaker service configured with Puppet diff --git a/deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml b/deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml index 68482d4424..419585f2f9 100644 --- a/deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml +++ b/deployment/pacemaker/pacemaker-remote-baremetal-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Pacemaker remote service configured with Puppet diff --git a/deployment/placement/placement-api-container-puppet.yaml b/deployment/placement/placement-api-container-puppet.yaml index e86b1a3d88..07c04c4628 100644 --- a/deployment/placement/placement-api-container-puppet.yaml +++ b/deployment/placement/placement-api-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Placement API service diff --git a/deployment/podman/podman-baremetal-ansible.yaml b/deployment/podman/podman-baremetal-ansible.yaml index 65a84bc132..1cd2aa606c 100644 --- a/deployment/podman/podman-baremetal-ansible.yaml +++ b/deployment/podman/podman-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Configures podman on the host diff --git a/deployment/qdr/qdrouterd-container-puppet.yaml b/deployment/qdr/qdrouterd-container-puppet.yaml index a0173bd268..b026304042 100644 --- a/deployment/qdr/qdrouterd-container-puppet.yaml +++ b/deployment/qdr/qdrouterd-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Qpid dispatch router service diff --git a/deployment/rabbitmq/rabbitmq-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-container-puppet.yaml index 7949f26170..4f8f60c008 100644 --- a/deployment/rabbitmq/rabbitmq-container-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Rabbitmq service diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml index cccce7a036..9b3cf8b8cd 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Rabbitmq service diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml index 72065549d4..64f36eef58 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Rabbitmq service diff --git a/deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml index e54e8837ea..3458ba3817 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-notify-shared-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Oslo Notify using a shared OpenStack containerized Rabbitmq service diff --git a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml index 1e8cda5218..1bf7005ff2 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Rabbitmq service diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml index b82d5de136..fa714d2a8e 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Rabbitmq service diff --git a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml index 498b1f0439..14caaf0375 100644 --- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml +++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Rabbitmq service diff --git a/deployment/rhsm/rhsm-baremetal-ansible.yaml b/deployment/rhsm/rhsm-baremetal-ansible.yaml index cdd441642a..d5202805c3 100644 --- a/deployment/rhsm/rhsm-baremetal-ansible.yaml +++ b/deployment/rhsm/rhsm-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: Configure Red Hat Subscription Management. diff --git a/deployment/securetty/securetty-baremetal-ansible.yaml b/deployment/securetty/securetty-baremetal-ansible.yaml index 565beaea07..7d95d71c32 100644 --- a/deployment/securetty/securetty-baremetal-ansible.yaml +++ b/deployment/securetty/securetty-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Configure securetty values diff --git a/deployment/snmp/snmp-baremetal-puppet.yaml b/deployment/snmp/snmp-baremetal-puppet.yaml index fa577a5e0b..2b4cc9347e 100644 --- a/deployment/snmp/snmp-baremetal-puppet.yaml +++ b/deployment/snmp/snmp-baremetal-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > SNMP client configured with Puppet, to facilitate Ceilometer Hardware diff --git a/deployment/sshd/sshd-baremetal-ansible.yaml b/deployment/sshd/sshd-baremetal-ansible.yaml index ca7df64974..594079d07f 100644 --- a/deployment/sshd/sshd-baremetal-ansible.yaml +++ b/deployment/sshd/sshd-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Configure sshd_config diff --git a/deployment/sshd/sshd-baremetal-puppet.yaml b/deployment/sshd/sshd-baremetal-puppet.yaml index dd2982cce1..3defb01cca 100644 --- a/deployment/sshd/sshd-baremetal-puppet.yaml +++ b/deployment/sshd/sshd-baremetal-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Configure sshd_config diff --git a/deployment/swift/external-swift-proxy-baremetal-puppet.yaml b/deployment/swift/external-swift-proxy-baremetal-puppet.yaml index d5ed823063..8abc9a02eb 100644 --- a/deployment/swift/external-swift-proxy-baremetal-puppet.yaml +++ b/deployment/swift/external-swift-proxy-baremetal-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > External Swift Proxy endpoint configured with Puppet diff --git a/deployment/swift/swift-base.yaml b/deployment/swift/swift-base.yaml index 24d99b861d..30bb47f01a 100644 --- a/deployment/swift/swift-base.yaml +++ b/deployment/swift/swift-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Swift Proxy service configured with Puppet diff --git a/deployment/swift/swift-dispersion-baremetal-puppet.yaml b/deployment/swift/swift-dispersion-baremetal-puppet.yaml index 087a83b4d1..45060a6d76 100644 --- a/deployment/swift/swift-dispersion-baremetal-puppet.yaml +++ b/deployment/swift/swift-dispersion-baremetal-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Swift dispersion tool configured with Puppet diff --git a/deployment/swift/swift-proxy-container-puppet.yaml b/deployment/swift/swift-proxy-container-puppet.yaml index c90cd3a8e2..cf7ea026b5 100644 --- a/deployment/swift/swift-proxy-container-puppet.yaml +++ b/deployment/swift/swift-proxy-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized swift proxy service diff --git a/deployment/swift/swift-ringbuilder-container-puppet.yaml b/deployment/swift/swift-ringbuilder-container-puppet.yaml index ecacc0e3cf..961502a433 100644 --- a/deployment/swift/swift-ringbuilder-container-puppet.yaml +++ b/deployment/swift/swift-ringbuilder-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack Swift Ringbuilder diff --git a/deployment/swift/swift-storage-container-puppet.yaml b/deployment/swift/swift-storage-container-puppet.yaml index 50a7e0956d..0cf06adceb 100644 --- a/deployment/swift/swift-storage-container-puppet.yaml +++ b/deployment/swift/swift-storage-container-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Swift Storage services. diff --git a/deployment/tests/test-container-volume.yaml b/deployment/tests/test-container-volume.yaml index 83a0e8a7d9..639accc8b8 100644 --- a/deployment/tests/test-container-volume.yaml +++ b/deployment/tests/test-container-volume.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Configures a test container volume diff --git a/deployment/time/ptp-baremetal-ansible.yaml b/deployment/time/ptp-baremetal-ansible.yaml index f6b09047dd..3a256ea114 100644 --- a/deployment/time/ptp-baremetal-ansible.yaml +++ b/deployment/time/ptp-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Composable Timezone service diff --git a/deployment/time/timezone-baremetal-ansible.yaml b/deployment/time/timezone-baremetal-ansible.yaml index 44f6b08679..a3202852b4 100644 --- a/deployment/time/timezone-baremetal-ansible.yaml +++ b/deployment/time/timezone-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Composable Timezone service diff --git a/deployment/timemaster/timemaster-baremetal-ansible.yaml b/deployment/timemaster/timemaster-baremetal-ansible.yaml index ac68bbcfef..7cddad6540 100644 --- a/deployment/timemaster/timemaster-baremetal-ansible.yaml +++ b/deployment/timemaster/timemaster-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Time services such as timemaster with deployment using ansible, this YAML file diff --git a/deployment/timesync/chrony-baremetal-ansible.yaml b/deployment/timesync/chrony-baremetal-ansible.yaml index 2e55f7a393..7d19f0a74c 100644 --- a/deployment/timesync/chrony-baremetal-ansible.yaml +++ b/deployment/timesync/chrony-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Chrony time service deployment using ansible, this YAML file diff --git a/deployment/tls/undercloud-remove-novajoin.yaml b/deployment/tls/undercloud-remove-novajoin.yaml index 0f37bbbd7a..a94790b8bc 100644 --- a/deployment/tls/undercloud-remove-novajoin.yaml +++ b/deployment/tls/undercloud-remove-novajoin.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: Deletes novajoin containers from undercloud diff --git a/deployment/tls/undercloud-tls.yaml b/deployment/tls/undercloud-tls.yaml index e9f7656460..42433a6241 100644 --- a/deployment/tls/undercloud-tls.yaml +++ b/deployment/tls/undercloud-tls.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: Enrolls the undercloud with the IPA server for TLS-e deployments diff --git a/deployment/tripleo-firewall/tripleo-firewall-baremetal-ansible.yaml b/deployment/tripleo-firewall/tripleo-firewall-baremetal-ansible.yaml index 0bb0500de1..e5f571eb16 100644 --- a/deployment/tripleo-firewall/tripleo-firewall-baremetal-ansible.yaml +++ b/deployment/tripleo-firewall/tripleo-firewall-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > TripleO Firewall settings diff --git a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml index 117ea3524f..fcc251977a 100644 --- a/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml +++ b/deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > TripleO Package installation settings diff --git a/deployment/tuned/tuned-baremetal-ansible.yaml b/deployment/tuned/tuned-baremetal-ansible.yaml index f27885bd08..affe201f1d 100644 --- a/deployment/tuned/tuned-baremetal-ansible.yaml +++ b/deployment/tuned/tuned-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Configure tuned diff --git a/deployment/unbound/unbound-container-ansible.yaml b/deployment/unbound/unbound-container-ansible.yaml index 40656dbc01..6cd77786b9 100644 --- a/deployment/unbound/unbound-container-ansible.yaml +++ b/deployment/unbound/unbound-container-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > OpenStack containerized Unbound DNS resolver diff --git a/deployment/undercloud/minion-rabbitmq-puppet.yaml b/deployment/undercloud/minion-rabbitmq-puppet.yaml index 9d549ab6e8..d911995b44 100644 --- a/deployment/undercloud/minion-rabbitmq-puppet.yaml +++ b/deployment/undercloud/minion-rabbitmq-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Service to provide oslo messaging credentials for the Undercloud Minion diff --git a/deployment/undercloud/undercloud-upgrade.yaml b/deployment/undercloud/undercloud-upgrade.yaml index b9f88f86b3..16a2841c6f 100644 --- a/deployment/undercloud/undercloud-upgrade.yaml +++ b/deployment/undercloud/undercloud-upgrade.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Upgrade a non-containerized undercloud to a containerized undercloud. diff --git a/deployment/validations/tripleo-validations-baremetal-ansible.yaml b/deployment/validations/tripleo-validations-baremetal-ansible.yaml index 5cfc927d20..6d3aa3be7b 100644 --- a/deployment/validations/tripleo-validations-baremetal-ansible.yaml +++ b/deployment/validations/tripleo-validations-baremetal-ansible.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Configure TripleO Validations with Ansible. diff --git a/deployment/veritas-hyperscale/veritas-hyperscale-controller-baremetal-puppet.yaml b/deployment/veritas-hyperscale/veritas-hyperscale-controller-baremetal-puppet.yaml index c6f648d22f..f06329cbf1 100644 --- a/deployment/veritas-hyperscale/veritas-hyperscale-controller-baremetal-puppet.yaml +++ b/deployment/veritas-hyperscale/veritas-hyperscale-controller-baremetal-puppet.yaml @@ -11,7 +11,7 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -heat_template_version: rocky +heat_template_version: wallaby description: > Openstack Veritas HyperScale backend diff --git a/deployment/vpp/vpp-baremetal-puppet.yaml b/deployment/vpp/vpp-baremetal-puppet.yaml index e061aae4fc..34788253e3 100644 --- a/deployment/vpp/vpp-baremetal-puppet.yaml +++ b/deployment/vpp/vpp-baremetal-puppet.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Vpp service configured with Puppet diff --git a/extraconfig/all_nodes/swap-partition.j2.yaml b/extraconfig/all_nodes/swap-partition.j2.yaml index 5bca8e7850..2355c2bae4 100644 --- a/extraconfig/all_nodes/swap-partition.j2.yaml +++ b/extraconfig/all_nodes/swap-partition.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: Template file to add a swap partition to a node. diff --git a/extraconfig/all_nodes/swap.j2.yaml b/extraconfig/all_nodes/swap.j2.yaml index b70a6a9014..20bee9a3c2 100644 --- a/extraconfig/all_nodes/swap.j2.yaml +++ b/extraconfig/all_nodes/swap.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: Template file to add a swap file to a node. diff --git a/extraconfig/nova_metadata/krb-service-principals/role.role.j2.yaml b/extraconfig/nova_metadata/krb-service-principals/role.role.j2.yaml index 378c9422f7..5517cd3cca 100644 --- a/extraconfig/nova_metadata/krb-service-principals/role.role.j2.yaml +++ b/extraconfig/nova_metadata/krb-service-principals/role.role.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: 'Generates the relevant service principals for a {{role.name}} server' parameters: diff --git a/extraconfig/post_deploy/default.yaml b/extraconfig/post_deploy/default.yaml index b557d69932..4f5edb23fd 100644 --- a/extraconfig/post_deploy/default.yaml +++ b/extraconfig/post_deploy/default.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: 'Extra Post Deployment Config' parameters: servers: diff --git a/extraconfig/post_deploy/example.yaml b/extraconfig/post_deploy/example.yaml index 99d7cc4253..5459ea04e8 100644 --- a/extraconfig/post_deploy/example.yaml +++ b/extraconfig/post_deploy/example.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Example extra config for post-deployment diff --git a/extraconfig/post_deploy/example_run_on_update.yaml b/extraconfig/post_deploy/example_run_on_update.yaml index 38efe9ae9e..8833908403 100644 --- a/extraconfig/post_deploy/example_run_on_update.yaml +++ b/extraconfig/post_deploy/example_run_on_update.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Example extra config for post-deployment, this re-runs every update diff --git a/extraconfig/post_deploy/undercloud_post.yaml b/extraconfig/post_deploy/undercloud_post.yaml index f4ba3d598c..603232a4b8 100644 --- a/extraconfig/post_deploy/undercloud_post.yaml +++ b/extraconfig/post_deploy/undercloud_post.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Post-deployment for the TripleO undercloud diff --git a/firstboot/conntectx3_streering.yaml b/firstboot/conntectx3_streering.yaml index 3466b00baf..c19de1a77a 100644 --- a/firstboot/conntectx3_streering.yaml +++ b/firstboot/conntectx3_streering.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > This's a temporary workaround for adding this option diff --git a/firstboot/os-net-config-mappings.yaml b/firstboot/os-net-config-mappings.yaml index 39dc14949a..59964c8a7a 100644 --- a/firstboot/os-net-config-mappings.yaml +++ b/firstboot/os-net-config-mappings.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > DEPRECATED! Configure os-net-config mappings for specific nodes diff --git a/firstboot/userdata_default.yaml b/firstboot/userdata_default.yaml index 0839cd8c2d..37e8fa1f99 100644 --- a/firstboot/userdata_default.yaml +++ b/firstboot/userdata_default.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > This is a default no-op template which provides empty user-data diff --git a/firstboot/userdata_dev_rsync.yaml b/firstboot/userdata_dev_rsync.yaml index 73ff40e9ee..f8490dd7b3 100644 --- a/firstboot/userdata_dev_rsync.yaml +++ b/firstboot/userdata_dev_rsync.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > This is first boot configuration for development purposes. It allows diff --git a/firstboot/userdata_example.yaml b/firstboot/userdata_example.yaml index 85e828dbb6..77983fb6bc 100644 --- a/firstboot/userdata_example.yaml +++ b/firstboot/userdata_example.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby # NOTE: You don't need to pass the parameter explicitly from the # parent template, it can be specified via the parameter_defaults diff --git a/firstboot/userdata_heat_admin.yaml b/firstboot/userdata_heat_admin.yaml index 40dabe52df..371aea4644 100644 --- a/firstboot/userdata_heat_admin.yaml +++ b/firstboot/userdata_heat_admin.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby parameters: # Can be overridden via parameter_defaults in the environment diff --git a/firstboot/userdata_root_password.yaml b/firstboot/userdata_root_password.yaml index 7d7d71103c..9080097797 100644 --- a/firstboot/userdata_root_password.yaml +++ b/firstboot/userdata_root_password.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Uses cloud-init to enable root logins and set the root password. diff --git a/firstboot/userdata_timesync.yaml b/firstboot/userdata_timesync.yaml index 10810324e1..fd3c6fbc92 100644 --- a/firstboot/userdata_timesync.yaml +++ b/firstboot/userdata_timesync.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby parameters: NtpServer: diff --git a/network/deployed_networks.yaml b/network/deployed_networks.yaml index 0fe9ee93a3..b67a27350d 100644 --- a/network/deployed_networks.yaml +++ b/network/deployed_networks.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: Create networks to split out Overcloud traffic diff --git a/network/endpoints/build_endpoint_map.py b/network/endpoints/build_endpoint_map.py index d6a1fe7e96..2d1c8ea14b 100755 --- a/network/endpoints/build_endpoint_map.py +++ b/network/endpoints/build_endpoint_map.py @@ -205,7 +205,7 @@ def template_endpoint_items(config): def generate_endpoint_map_template(config): return collections.OrderedDict([ - ('heat_template_version', 'rocky'), + ('heat_template_version', 'wallaby'), ('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 ' diff --git a/network/endpoints/endpoint_map.yaml b/network/endpoints/endpoint_map.yaml index 5fcb043a0f..f7f111a1fb 100644 --- a/network/endpoints/endpoint_map.yaml +++ b/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: rocky +heat_template_version: wallaby 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 diff --git a/network/network.j2 b/network/network.j2 index 767ed5661d..1c7e36a9b9 100644 --- a/network/network.j2 +++ b/network/network.j2 @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > {{network.name}} network definition (automatically generated). diff --git a/network/networks.j2.yaml b/network/networks.j2.yaml index 45abe7d153..d027b53d12 100644 --- a/network/networks.j2.yaml +++ b/network/networks.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: Create networks to split out Overcloud traffic diff --git a/network/ovn_mac_addr_net.yaml b/network/ovn_mac_addr_net.yaml index 6ae7ca2b01..7c11483821 100644 --- a/network/ovn_mac_addr_net.yaml +++ b/network/ovn_mac_addr_net.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: Network used to allocate MAC addresses for OVN chassis. diff --git a/network/ports/ctlplane_vip.yaml b/network/ports/ctlplane_vip.yaml index d0f527bf1d..c17a924f81 100644 --- a/network/ports/ctlplane_vip.yaml +++ b/network/ports/ctlplane_vip.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Creates a port for a VIP on the undercloud ctlplane network. diff --git a/network/ports/deployed_port.j2 b/network/ports/deployed_port.j2 index 68d299b38d..2409d99026 100644 --- a/network/ports/deployed_port.j2 +++ b/network/ports/deployed_port.j2 @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Deployed port on the {{network.name}} network. diff --git a/network/ports/deployed_vip_ctlplane.yaml b/network/ports/deployed_vip_ctlplane.yaml index 5f5c82e545..e9d41fe37a 100644 --- a/network/ports/deployed_vip_ctlplane.yaml +++ b/network/ports/deployed_vip_ctlplane.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Deployed VIP port on the Control Plane network. diff --git a/network/ports/deployed_vip_port.j2 b/network/ports/deployed_vip_port.j2 index 3be0a7ff44..ad2f5945dc 100644 --- a/network/ports/deployed_vip_port.j2 +++ b/network/ports/deployed_vip_port.j2 @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Deployed VIP port on the {{network.name}} network. diff --git a/network/ports/from_service.yaml b/network/ports/from_service.yaml index 2e257a4118..7aab838e69 100644 --- a/network/ports/from_service.yaml +++ b/network/ports/from_service.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Returns an IP from a service mapped list of IPs diff --git a/network/ports/from_service_v6.yaml b/network/ports/from_service_v6.yaml index 7b9a29a044..a3e33ebd50 100644 --- a/network/ports/from_service_v6.yaml +++ b/network/ports/from_service_v6.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Returns an IP from a service mapped list of IPv6 IPs diff --git a/network/ports/net_ip_list_map.j2.yaml b/network/ports/net_ip_list_map.j2.yaml index 8268265708..6e6ea5bb66 100644 --- a/network/ports/net_ip_list_map.j2.yaml +++ b/network/ports/net_ip_list_map.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby parameters: ControlPlaneIpList: diff --git a/network/ports/net_ip_map.j2.yaml b/network/ports/net_ip_map.j2.yaml index 54d00540cf..f698b7e8c7 100644 --- a/network/ports/net_ip_map.j2.yaml +++ b/network/ports/net_ip_map.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby parameters: ControlPlaneIp: diff --git a/network/ports/net_vip_map_external.j2.yaml b/network/ports/net_vip_map_external.j2.yaml index 2ee0f6de39..824474afb5 100644 --- a/network/ports/net_vip_map_external.j2.yaml +++ b/network/ports/net_vip_map_external.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby parameters: # Set these via parameter defaults to configure external VIPs diff --git a/network/ports/net_vip_map_external_v6.j2.yaml b/network/ports/net_vip_map_external_v6.j2.yaml index 2ee0f6de39..824474afb5 100644 --- a/network/ports/net_vip_map_external_v6.j2.yaml +++ b/network/ports/net_vip_map_external_v6.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby parameters: # Set these via parameter defaults to configure external VIPs diff --git a/network/ports/noop.yaml b/network/ports/noop.yaml index e3d6a6474a..3739027e72 100644 --- a/network/ports/noop.yaml +++ b/network/ports/noop.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Returns the control plane port (provisioning network) as the ip_address. diff --git a/network/ports/ovn_mac_addr_port.yaml b/network/ports/ovn_mac_addr_port.yaml index efbbe43d82..fccdaf5079 100644 --- a/network/ports/ovn_mac_addr_port.yaml +++ b/network/ports/ovn_mac_addr_port.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Port without IP address, used to allocate MAC addresses for OVN chassis. diff --git a/network/ports/port.j2 b/network/ports/port.j2 index a8f0462694..b7ec52d27f 100644 --- a/network/ports/port.j2 +++ b/network/ports/port.j2 @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Creates a port on the {{network.name}} network. The IP address will be chosen diff --git a/network/ports/port_from_pool.j2 b/network/ports/port_from_pool.j2 index 748eba64f4..942c054710 100644 --- a/network/ports/port_from_pool.j2 +++ b/network/ports/port_from_pool.j2 @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Creates a port on the {{network.name}} network, using a map of IPs per role. diff --git a/network/ports/vip.yaml b/network/ports/vip.yaml index 7dbc1e5f0b..b6c1c653a9 100644 --- a/network/ports/vip.yaml +++ b/network/ports/vip.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Creates a port for a VIP on the isolated network NetworkName. diff --git a/network/ports/vip_v6.yaml b/network/ports/vip_v6.yaml index 42956557c9..b5c150cd0e 100644 --- a/network/ports/vip_v6.yaml +++ b/network/ports/vip_v6.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Creates a port for a VIP on the isolated network NetworkName. diff --git a/network/service_net_map.j2.yaml b/network/service_net_map.j2.yaml index 9b32626072..7c2e6aa193 100644 --- a/network/service_net_map.j2.yaml +++ b/network/service_net_map.j2.yaml @@ -6,7 +6,7 @@ {% set _ = _service_nets.update({network.name_lower:network.name_lower}) %} {% endif %} {% endfor %} -heat_template_version: rocky +heat_template_version: wallaby description: > Mapping of service_name_network -> network name diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index d15dafe016..6690457ae5 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -7,7 +7,7 @@ {%- endfor -%} {%- set primary_role_name = primary_role[0].name -%} # primary role is: {{primary_role_name}} -heat_template_version: rocky +heat_template_version: wallaby description: > Deploy an OpenStack environment, consisting of several node types (roles), diff --git a/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml b/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml index a3e4ebee11..a3252bfc66 100644 --- a/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml +++ b/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: Configure hieradata for Big Switch agents on compute node diff --git a/puppet/extraconfig/pre_deploy/controller/multiple.yaml b/puppet/extraconfig/pre_deploy/controller/multiple.yaml index c89426b17d..05a278c504 100644 --- a/puppet/extraconfig/pre_deploy/controller/multiple.yaml +++ b/puppet/extraconfig/pre_deploy/controller/multiple.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: 'Extra Pre-Deployment Config, multiple' parameters: server: diff --git a/puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml b/puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml index fc627d9df8..9f06212e7c 100644 --- a/puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml +++ b/puppet/extraconfig/pre_deploy/controller/neutron-ml2-bigswitch.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: Configure hieradata for Neutron Big Switch configuration diff --git a/puppet/extraconfig/pre_deploy/default.yaml b/puppet/extraconfig/pre_deploy/default.yaml index f078abf300..199de04500 100644 --- a/puppet/extraconfig/pre_deploy/default.yaml +++ b/puppet/extraconfig/pre_deploy/default.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: 'Noop Extra Pre-Deployment Config' parameters: server: diff --git a/puppet/extraconfig/pre_deploy/per_node.yaml b/puppet/extraconfig/pre_deploy/per_node.yaml index 815afc02d1..b2f03ac88b 100644 --- a/puppet/extraconfig/pre_deploy/per_node.yaml +++ b/puppet/extraconfig/pre_deploy/per_node.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: Configure hieradata overrides for specific nodes diff --git a/puppet/extraconfig/tls/ca-inject.yaml b/puppet/extraconfig/tls/ca-inject.yaml index 959da97b86..086498d8c1 100644 --- a/puppet/extraconfig/tls/ca-inject.yaml +++ b/puppet/extraconfig/tls/ca-inject.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > This is a template which will inject the trusted anchor. diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index 3990af5035..9369a5da8e 100644 --- a/puppet/role.role.j2.yaml +++ b/puppet/role.role.j2.yaml @@ -2,7 +2,7 @@ {#- ## where a few parameter/resource names don't match the expected pattern #} {#- ## FIXME: we need some way to deprecate the old inconsistent parameters #} {%- set server_resource_name = role.deprecated_server_resource_name|default(role.name) -%} -heat_template_version: rocky +heat_template_version: wallaby description: 'OpenStack {{role.name}} node configured by Puppet' parameters: {%- set default_flavor_name = role.FlavorDefault|default('baremetal') %} diff --git a/tools/tests/nic_config_convert_samples/heat_templates/2-linux-bonds-vlans-controller.yaml b/tools/tests/nic_config_convert_samples/heat_templates/2-linux-bonds-vlans-controller.yaml index dfc377f2d5..942c7fce37 100644 --- a/tools/tests/nic_config_convert_samples/heat_templates/2-linux-bonds-vlans-controller.yaml +++ b/tools/tests/nic_config_convert_samples/heat_templates/2-linux-bonds-vlans-controller.yaml @@ -1,5 +1,5 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Software Config to drive os-net-config with 2 Linux bonds. One bond is on a bridge with VLANs attached for the Controller role. diff --git a/tools/tests/nic_config_convert_samples/heat_templates/bond-vlans-controller.yaml b/tools/tests/nic_config_convert_samples/heat_templates/bond-vlans-controller.yaml index a750fe21a2..965c0ab058 100644 --- a/tools/tests/nic_config_convert_samples/heat_templates/bond-vlans-controller.yaml +++ b/tools/tests/nic_config_convert_samples/heat_templates/bond-vlans-controller.yaml @@ -1,5 +1,5 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Software Config to drive os-net-config with 2 bonded nics on a bridge with VLANs attached for the Controller role. parameters: diff --git a/tools/tests/nic_config_convert_samples/heat_templates/complex.yaml b/tools/tests/nic_config_convert_samples/heat_templates/complex.yaml index d1ef447b00..4b5c702a77 100644 --- a/tools/tests/nic_config_convert_samples/heat_templates/complex.yaml +++ b/tools/tests/nic_config_convert_samples/heat_templates/complex.yaml @@ -1,4 +1,4 @@ -heat_template_version: rocky +heat_template_version: wallaby parameters: # Supernets diff --git a/tools/tests/nic_config_convert_samples/heat_templates/multiple-nics-vlans-controller.yaml b/tools/tests/nic_config_convert_samples/heat_templates/multiple-nics-vlans-controller.yaml index c297a74a47..307778a143 100644 --- a/tools/tests/nic_config_convert_samples/heat_templates/multiple-nics-vlans-controller.yaml +++ b/tools/tests/nic_config_convert_samples/heat_templates/multiple-nics-vlans-controller.yaml @@ -1,5 +1,5 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Software Config to drive os-net-config to configure multiple interfaces for the Controller role. parameters: diff --git a/tools/tests/nic_config_convert_samples/heat_templates/single-nic-linux-bridge-vlans-controller.yaml b/tools/tests/nic_config_convert_samples/heat_templates/single-nic-linux-bridge-vlans-controller.yaml index 6942b63342..ca2f4bc5c3 100644 --- a/tools/tests/nic_config_convert_samples/heat_templates/single-nic-linux-bridge-vlans-controller.yaml +++ b/tools/tests/nic_config_convert_samples/heat_templates/single-nic-linux-bridge-vlans-controller.yaml @@ -1,5 +1,5 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Software Config to drive os-net-config to configure VLANs for the Controller role. parameters: diff --git a/tools/tests/nic_config_convert_samples/heat_templates/single-nic-vlans-controller.yaml b/tools/tests/nic_config_convert_samples/heat_templates/single-nic-vlans-controller.yaml index a5a3a06abc..958d502488 100644 --- a/tools/tests/nic_config_convert_samples/heat_templates/single-nic-vlans-controller.yaml +++ b/tools/tests/nic_config_convert_samples/heat_templates/single-nic-vlans-controller.yaml @@ -1,5 +1,5 @@ -heat_template_version: rocky +heat_template_version: wallaby description: > Software Config to drive os-net-config to configure VLANs for the Controller role. parameters: diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index a549b3f59c..33d17a44a1 100755 --- a/tools/yaml-validate.py +++ b/tools/yaml-validate.py @@ -33,7 +33,7 @@ def is_string(value): # list should contain only the alias name for the current branch. # This allows to avoid merging old templates versions aliases. valid_heat_template_versions = [ - 'rocky', + 'wallaby', ] current_heat_template_version = valid_heat_template_versions[-1]