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
7 months ago · c9991c2e31
349 changed files with 349 additions and 350 deletions
--- 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:
--- 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:
--- 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
--- 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
--- 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,
--- 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
--- a/config-download-software.yaml
+++ b/config-download-software.yaml
@ -1,4 +1,4 @@
-heat_template_version: rocky
+heat_template_version: wallaby

 parameters:

--- a/config-download-structured.yaml
+++ b/config-download-structured.yaml
@ -1,4 +1,4 @@
-heat_template_version: rocky
+heat_template_version: wallaby

 parameters:

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

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

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

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

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