From 44ef2a3ec16f3381ba4b6308519a59fdf6ba659a Mon Sep 17 00:00:00 2001 From: Carlos Camacho Date: Mon, 5 Mar 2018 19:28:35 +0100 Subject: [PATCH] Change template names to rocky The new master branch should point now to rocky. So, HOT templates should specify that they might contain features for rocky release [1] Also, this submission updates the yaml validation to use only latest heat_version alias. There are cases in which we will need to set the version for specific templates i.e. mixed versions, so there is added a variable to assign specific templates to specific heat_version aliases, avoiding the introductions of error by bulk replacing the the old version in new releases. [1]: https://docs.openstack.org/heat/latest/template_guide/hot_spec.html#rocky Change-Id: Ib17526d9cc453516d99d4659ee5fa51a5aa7fb4b --- all-nodes-validation.yaml | 2 +- bootstrap-config.yaml | 2 +- ci/common/all-nodes-validation-disabled.yaml | 2 +- .../net-config-multinode-os-net-config.yaml | 2 +- ci/common/net-config-multinode.yaml | 2 +- ci/common/net-config-simple-bridge.yaml | 2 +- ci/environments/multinode-core.yaml | 2 +- .../nic-configs/ceph-storage.yaml | 2 +- .../nic-configs/cinder-storage.yaml | 2 +- .../nic-configs/compute.yaml | 2 +- .../nic-configs/controller.yaml | 2 +- .../nic-configs/swift-storage.yaml | 2 +- .../nic-configs/ceph-storage.yaml | 2 +- .../nic-configs/cinder-storage.yaml | 2 +- .../multiple-nics/nic-configs/compute.yaml | 2 +- .../multiple-nics/nic-configs/controller.yaml | 2 +- .../nic-configs/swift-storage.yaml | 2 +- .../public-bond/nic-configs/ceph-storage.yaml | 2 +- .../nic-configs/cinder-storage.yaml | 2 +- .../public-bond/nic-configs/compute.yaml | 2 +- .../public-bond/nic-configs/controller.yaml | 2 +- .../nic-configs/swift-storage.yaml | 2 +- ci/pingtests/tenantvm_floatingip.yaml | 3 ++ common/deploy-steps.j2 | 2 +- common/services.yaml | 2 +- config-download-software.yaml | 2 +- config-download-structured.yaml | 2 +- default_passwords.yaml | 2 +- deployed-server/ctlplane-port.yaml | 2 +- deployed-server/deployed-neutron-port.yaml | 2 +- .../deployed-server-bootstrap-centos.yaml | 2 +- .../deployed-server-bootstrap-rhel.yaml | 2 +- .../deployed-server-environment-output.yaml | 2 +- deployed-server/deployed-server.yaml | 2 +- docker/services/aodh-api.yaml | 2 +- docker/services/aodh-evaluator.yaml | 2 +- docker/services/aodh-listener.yaml | 2 +- docker/services/aodh-notifier.yaml | 2 +- docker/services/barbican-api.yaml | 2 +- docker/services/ceilometer-agent-central.yaml | 2 +- docker/services/ceilometer-agent-compute.yaml | 2 +- docker/services/ceilometer-agent-ipmi.yaml | 2 +- .../ceilometer-agent-notification.yaml | 2 +- docker/services/ceph-ansible/ceph-base.yaml | 2 +- docker/services/ceph-ansible/ceph-client.yaml | 2 +- .../services/ceph-ansible/ceph-external.yaml | 2 +- docker/services/ceph-ansible/ceph-mds.yaml | 2 +- docker/services/ceph-ansible/ceph-mgr.yaml | 2 +- docker/services/ceph-ansible/ceph-mon.yaml | 2 +- docker/services/ceph-ansible/ceph-nfs.yaml | 2 +- docker/services/ceph-ansible/ceph-osd.yaml | 2 +- .../services/ceph-ansible/ceph-rbdmirror.yaml | 2 +- docker/services/ceph-ansible/ceph-rgw.yaml | 2 +- docker/services/cinder-api.yaml | 2 +- docker/services/cinder-backup.yaml | 2 +- docker/services/cinder-common.yaml | 2 +- docker/services/cinder-scheduler.yaml | 2 +- docker/services/cinder-volume.yaml | 2 +- docker/services/collectd.yaml | 2 +- docker/services/congress.yaml | 2 +- docker/services/containers-common.yaml | 2 +- docker/services/database/mongodb.yaml | 2 +- docker/services/database/mysql.yaml | 2 +- docker/services/database/redis.yaml | 2 +- docker/services/designate-api.yaml | 2 +- docker/services/designate-central.yaml | 2 +- docker/services/designate-mdns.yaml | 2 +- docker/services/designate-producer.yaml | 2 +- docker/services/designate-sink.yaml | 2 +- docker/services/designate-worker.yaml | 2 +- docker/services/ec2-api.yaml | 2 +- docker/services/etcd.yaml | 2 +- docker/services/fluentd.yaml | 2 +- docker/services/glance-api.yaml | 2 +- docker/services/gnocchi-api.yaml | 2 +- docker/services/gnocchi-metricd.yaml | 2 +- docker/services/gnocchi-statsd.yaml | 2 +- docker/services/haproxy.yaml | 2 +- docker/services/heat-api-cfn.yaml | 2 +- docker/services/heat-api.yaml | 2 +- docker/services/heat-engine.yaml | 2 +- docker/services/horizon.yaml | 2 +- docker/services/ironic-api.yaml | 2 +- docker/services/ironic-conductor.yaml | 2 +- docker/services/ironic-inspector.yaml | 2 +- docker/services/ironic-neutron-agent.yaml | 2 +- docker/services/ironic-pxe.yaml | 2 +- docker/services/iscsid.yaml | 2 +- docker/services/keepalived.yaml | 2 +- docker/services/keystone.yaml | 2 +- .../services/logging/files/barbican-api.yaml | 2 +- docker/services/logging/files/glance-api.yaml | 2 +- docker/services/logging/files/haproxy.yaml | 2 +- .../services/logging/files/heat-api-cfn.yaml | 2 +- docker/services/logging/files/heat-api.yaml | 2 +- .../services/logging/files/heat-engine.yaml | 2 +- docker/services/logging/files/keystone.yaml | 2 +- .../services/logging/files/neutron-api.yaml | 2 +- .../logging/files/neutron-common.yaml | 2 +- docker/services/logging/files/nova-api.yaml | 2 +- .../services/logging/files/nova-common.yaml | 2 +- .../logging/files/nova-placement.yaml | 2 +- docker/services/logging/files/panko-api.yaml | 2 +- .../services/logging/stdout/barbican-api.yaml | 2 +- .../services/logging/stdout/glance-api.yaml | 2 +- docker/services/logging/stdout/haproxy.yaml | 2 +- .../services/logging/stdout/heat-api-cfn.yaml | 2 +- docker/services/logging/stdout/heat-api.yaml | 2 +- .../services/logging/stdout/heat-engine.yaml | 2 +- docker/services/logging/stdout/keystone.yaml | 2 +- .../logging/stdout/neutron-common.yaml | 2 +- docker/services/logging/stdout/nova-api.yaml | 2 +- .../services/logging/stdout/nova-common.yaml | 2 +- .../services/logging/stdout/nova-libvirt.yaml | 2 +- .../logging/stdout/nova-placement.yaml | 2 +- docker/services/logging/stdout/panko-api.yaml | 2 +- docker/services/logrotate-crond.yaml | 2 +- docker/services/manila-api.yaml | 2 +- docker/services/manila-scheduler.yaml | 2 +- docker/services/manila-share.yaml | 2 +- docker/services/memcached.yaml | 2 +- .../messaging/notify-rabbitmq-shared.yaml | 2 +- .../services/messaging/notify-rabbitmq.yaml | 2 +- docker/services/messaging/rpc-qdrouterd.yaml | 2 +- docker/services/messaging/rpc-rabbitmq.yaml | 2 +- docker/services/mistral-api.yaml | 2 +- docker/services/mistral-engine.yaml | 2 +- docker/services/mistral-event-engine.yaml | 2 +- docker/services/mistral-executor.yaml | 2 +- docker/services/multipathd.yaml | 2 +- docker/services/neutron-api.yaml | 2 +- docker/services/neutron-bgpvpn-api.yaml | 2 +- docker/services/neutron-dhcp.yaml | 2 +- docker/services/neutron-l2gw-api.yaml | 2 +- docker/services/neutron-l3.yaml | 2 +- docker/services/neutron-lbaas-api.yaml | 2 +- docker/services/neutron-metadata.yaml | 2 +- docker/services/neutron-ovs-agent.yaml | 2 +- docker/services/neutron-ovs-dpdk-agent.yaml | 2 +- .../neutron-plugin-ml2-cisco-vts.yaml | 2 +- docker/services/neutron-plugin-ml2.yaml | 2 +- docker/services/neutron-sriov-agent.yaml | 2 +- docker/services/nova-api.yaml | 2 +- docker/services/nova-compute.yaml | 2 +- docker/services/nova-conductor.yaml | 2 +- docker/services/nova-consoleauth.yaml | 2 +- docker/services/nova-ironic.yaml | 2 +- docker/services/nova-libvirt.yaml | 2 +- docker/services/nova-metadata.yaml | 2 +- docker/services/nova-migration-target.yaml | 2 +- docker/services/nova-placement.yaml | 2 +- docker/services/nova-scheduler.yaml | 2 +- docker/services/nova-vnc-proxy.yaml | 2 +- docker/services/novajoin.yaml | 2 +- docker/services/octavia-api.yaml | 2 +- docker/services/octavia-health-manager.yaml | 2 +- docker/services/octavia-housekeeping.yaml | 2 +- docker/services/octavia-worker.yaml | 2 +- .../octavia/octavia-deployment-config.yaml | 2 +- docker/services/opendaylight-api.yaml | 2 +- docker/services/ovn-controller.yaml | 2 +- docker/services/ovn-dbs.yaml | 2 +- docker/services/ovn-metadata.yaml | 2 +- docker/services/pacemaker/cinder-backup.yaml | 2 +- docker/services/pacemaker/cinder-volume.yaml | 2 +- docker/services/pacemaker/clustercheck.yaml | 2 +- docker/services/pacemaker/database/mysql.yaml | 2 +- docker/services/pacemaker/database/redis.yaml | 2 +- docker/services/pacemaker/haproxy.yaml | 2 +- docker/services/pacemaker/manila-share.yaml | 2 +- .../services/pacemaker/notify-rabbitmq.yaml | 2 +- docker/services/pacemaker/ovn-dbs.yaml | 2 +- docker/services/pacemaker/rabbitmq.yaml | 2 +- docker/services/pacemaker/rpc-rabbitmq.yaml | 2 +- docker/services/panko-api.yaml | 2 +- docker/services/qdrouterd.yaml | 2 +- docker/services/rabbitmq.yaml | 2 +- docker/services/rsyslog-sidecar.yaml | 2 +- docker/services/sahara-api.yaml | 2 +- docker/services/sahara-engine.yaml | 2 +- docker/services/sensu-client.yaml | 2 +- docker/services/skydive/skydive-agent.yaml | 2 +- docker/services/skydive/skydive-analyzer.yaml | 2 +- docker/services/skydive/skydive-base.yaml | 2 +- docker/services/sshd.yaml | 2 +- docker/services/swift-proxy.yaml | 2 +- docker/services/swift-ringbuilder.yaml | 2 +- docker/services/swift-storage.yaml | 2 +- docker/services/tacker.yaml | 2 +- docker/services/tempest.yaml | 2 +- docker/services/tripleo-ui.yaml | 2 +- docker/services/undercloud-upgrade.yaml | 2 +- docker/services/zaqar.yaml | 2 +- extraconfig/all_nodes/mac_hostname.j2.yaml | 2 +- extraconfig/all_nodes/random_string.j2.yaml | 2 +- extraconfig/all_nodes/swap-partition.j2.yaml | 2 +- extraconfig/all_nodes/swap.j2.yaml | 2 +- .../krb-service-principals.j2.yaml | 2 +- extraconfig/post_deploy/default.yaml | 2 +- extraconfig/post_deploy/example.yaml | 2 +- .../post_deploy/example_run_on_update.yaml | 2 +- extraconfig/post_deploy/undercloud_post.yaml | 2 +- .../rhel-registration/rhel-registration.yaml | 2 +- .../pre_network/config_then_reboot.yaml | 2 +- .../pre_network/host_config_and_reboot.yaml | 2 +- extraconfig/services/ipsec.yaml | 2 +- extraconfig/services/kubernetes-master.yaml | 2 +- extraconfig/services/kubernetes-worker.yaml | 2 +- extraconfig/services/openshift-cns.yaml | 2 +- extraconfig/services/openshift-master.yaml | 2 +- extraconfig/services/openshift-worker.yaml | 2 +- extraconfig/services/rhsm.yaml | 2 +- .../tasks/post_puppet_pacemaker.j2.yaml | 2 +- .../tasks/post_puppet_pacemaker_restart.yaml | 2 +- extraconfig/tasks/pre_puppet_pacemaker.yaml | 2 +- extraconfig/tasks/ssh/host_public_key.yaml | 2 +- extraconfig/tasks/ssh/known_hosts_config.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 +- hosts-config.yaml | 2 +- net-config-bond.j2.yaml | 2 +- net-config-bridge.j2.yaml | 2 +- net-config-linux-bridge.j2.yaml | 2 +- net-config-noop.j2.yaml | 2 +- ...g-static-bridge-with-external-dhcp.j2.yaml | 2 +- net-config-static-bridge.j2.yaml | 2 +- net-config-static.j2.yaml | 2 +- net-config-undercloud.j2.yaml | 2 +- .../controller-no-external.j2.yaml | 2 +- .../bond-with-vlans/controller-v6.j2.yaml | 2 +- .../config/bond-with-vlans/role.role.j2.yaml | 2 +- .../config/multiple-nics/compute-dvr.j2.yaml | 2 +- .../multiple-nics/controller-v6.j2.yaml | 2 +- .../config/multiple-nics/role.role.j2.yaml | 2 +- .../controller-v6.j2.yaml | 2 +- .../role.role.j2.yaml | 2 +- .../controller-no-external.j2.yaml | 2 +- .../single-nic-vlans/controller-v6.j2.yaml | 2 +- .../config/single-nic-vlans/role.role.j2.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/ports/ctlplane_vip.yaml | 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/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 +- puppet/all-nodes-config.j2.yaml | 2 +- puppet/deploy-artifacts.yaml | 2 +- .../all_nodes/neutron-midonet-all-nodes.yaml | 2 +- .../neutron-ml2-cisco-nexus-ucsm.j2.yaml | 2 +- .../compute/neutron-ml2-bigswitch.yaml | 2 +- .../pre_deploy/controller/multiple.yaml | 2 +- .../controller/neutron-ml2-bigswitch.yaml | 2 +- .../controller/neutron-ml2-cisco-n1kv.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/extraconfig/tls/freeipa-enroll.yaml | 2 +- puppet/extraconfig/tls/tls-cert-inject.yaml | 2 +- puppet/role.role.j2.yaml | 2 +- puppet/services/aide.yaml | 2 +- puppet/services/aodh-api.yaml | 2 +- puppet/services/aodh-base.yaml | 2 +- puppet/services/aodh-evaluator.yaml | 2 +- puppet/services/aodh-listener.yaml | 2 +- puppet/services/aodh-notifier.yaml | 2 +- puppet/services/apache.j2.yaml | 2 +- puppet/services/auditd.yaml | 2 +- puppet/services/barbican-api.yaml | 2 +- puppet/services/barbican-backend-dogtag.yaml | 2 +- puppet/services/barbican-backend-kmip.yaml | 2 +- .../barbican-backend-pkcs11-crypto.yaml | 2 +- .../barbican-backend-simple-crypto.yaml | 2 +- puppet/services/ca-certs.yaml | 2 +- puppet/services/ceilometer-agent-central.yaml | 2 +- puppet/services/ceilometer-agent-compute.yaml | 2 +- puppet/services/ceilometer-agent-ipmi.yaml | 2 +- .../ceilometer-agent-notification.yaml | 2 +- puppet/services/ceilometer-base.yaml | 2 +- puppet/services/ceph-base.yaml | 2 +- puppet/services/ceph-client.yaml | 2 +- puppet/services/ceph-external.yaml | 2 +- puppet/services/ceph-mds.yaml | 2 +- puppet/services/ceph-mon.yaml | 2 +- puppet/services/ceph-osd.yaml | 2 +- puppet/services/ceph-rgw.yaml | 2 +- puppet/services/certmonger-user.yaml | 2 +- puppet/services/cinder-api.yaml | 2 +- .../cinder-backend-dellemc-unity.yaml | 2 +- .../cinder-backend-dellemc-vmax-iscsi.yaml | 2 +- .../services/cinder-backend-dellemc-vnx.yaml | 2 +- .../cinder-backend-dellemc-xtremio-iscsi.yaml | 2 +- puppet/services/cinder-backend-dellps.yaml | 2 +- puppet/services/cinder-backend-dellsc.yaml | 2 +- puppet/services/cinder-backend-netapp.yaml | 2 +- puppet/services/cinder-backend-nvmeof.yaml | 2 +- puppet/services/cinder-backend-pure.yaml | 2 +- puppet/services/cinder-backend-scaleio.yaml | 2 +- .../cinder-backend-veritas-hyperscale.yaml | 2 +- puppet/services/cinder-backup.yaml | 2 +- puppet/services/cinder-base.yaml | 2 +- puppet/services/cinder-hpelefthand-iscsi.yaml | 2 +- puppet/services/cinder-scheduler.yaml | 2 +- puppet/services/cinder-volume.yaml | 2 +- puppet/services/congress.yaml | 2 +- puppet/services/database/mongodb-base.yaml | 2 +- puppet/services/database/mongodb.yaml | 2 +- puppet/services/database/mysql-client.yaml | 2 +- puppet/services/database/mysql.yaml | 2 +- puppet/services/database/redis-base.yaml | 2 +- puppet/services/database/redis.yaml | 2 +- puppet/services/designate-api.yaml | 2 +- puppet/services/designate-base.yaml | 2 +- puppet/services/designate-central.yaml | 2 +- puppet/services/designate-mdns.yaml | 2 +- puppet/services/designate-producer.yaml | 2 +- puppet/services/designate-sink.yaml | 2 +- puppet/services/designate-worker.yaml | 2 +- .../disabled/ceilometer-api-disabled.yaml | 2 +- .../ceilometer-collector-disabled.yaml | 2 +- .../disabled/ceilometer-expirer-disabled.yaml | 2 +- .../disabled/glance-registry-disabled.yaml | 2 +- .../heat-api-cloudwatch-disabled.yaml | 2 +- .../services/disabled/mongodb-disabled.yaml | 2 +- puppet/services/docker-registry.yaml | 2 +- puppet/services/docker.yaml | 2 +- puppet/services/ec2-api.yaml | 2 +- puppet/services/etcd.yaml | 2 +- puppet/services/external-swift-proxy.yaml | 2 +- puppet/services/glance-api.yaml | 2 +- puppet/services/gnocchi-api.yaml | 2 +- puppet/services/gnocchi-base.yaml | 2 +- puppet/services/gnocchi-metricd.yaml | 2 +- puppet/services/gnocchi-statsd.yaml | 2 +- .../haproxy-internal-tls-certmonger.j2.yaml | 2 +- .../haproxy-public-tls-certmonger.yaml | 2 +- puppet/services/haproxy.yaml | 2 +- puppet/services/heat-api-cfn.yaml | 2 +- puppet/services/heat-api.yaml | 2 +- puppet/services/heat-base.yaml | 2 +- puppet/services/heat-engine.yaml | 2 +- puppet/services/horizon.yaml | 2 +- puppet/services/ironic-api.yaml | 2 +- puppet/services/ironic-base.yaml | 2 +- puppet/services/ironic-conductor.yaml | 2 +- puppet/services/ironic-inspector.yaml | 2 +- puppet/services/ironic-neutron-agent.yaml | 2 +- puppet/services/iscsid.yaml | 2 +- puppet/services/keepalived.yaml | 2 +- puppet/services/kernel.yaml | 2 +- puppet/services/keystone.yaml | 2 +- puppet/services/liquidio-compute-config.yaml | 2 +- puppet/services/logging/fluentd-config.yaml | 2 +- puppet/services/logging/fluentd.yaml | 2 +- puppet/services/login-defs.yaml | 2 +- puppet/services/manila-api.yaml | 2 +- puppet/services/manila-backend-cephfs.yaml | 2 +- puppet/services/manila-backend-isilon.yaml | 2 +- puppet/services/manila-backend-netapp.yaml | 2 +- puppet/services/manila-backend-unity.yaml | 2 +- puppet/services/manila-backend-vmax.yaml | 2 +- puppet/services/manila-backend-vnx.yaml | 2 +- puppet/services/manila-base.yaml | 2 +- puppet/services/manila-scheduler.yaml | 2 +- puppet/services/manila-share.yaml | 2 +- puppet/services/masquerade-networks.yaml | 2 +- puppet/services/memcached.yaml | 2 +- .../messaging/notify-rabbitmq-shared.yaml | 2 +- .../services/messaging/notify-rabbitmq.yaml | 2 +- puppet/services/messaging/rpc-qdrouterd.yaml | 2 +- puppet/services/messaging/rpc-rabbitmq.yaml | 2 +- puppet/services/metrics/collectd.yaml | 2 +- puppet/services/mistral-api.yaml | 2 +- puppet/services/mistral-base.yaml | 2 +- puppet/services/mistral-engine.yaml | 2 +- puppet/services/mistral-event-engine.yaml | 2 +- puppet/services/mistral-executor.yaml | 2 +- puppet/services/monitoring/sensu-base.yaml | 2 +- puppet/services/monitoring/sensu-client.yaml | 2 +- puppet/services/neutron-api.yaml | 2 +- puppet/services/neutron-base.yaml | 2 +- puppet/services/neutron-bgpvpn-api.yaml | 2 +- puppet/services/neutron-bgpvpn-bagpipe.yaml | 2 +- puppet/services/neutron-bigswitch-agent.yaml | 2 +- .../neutron-compute-plugin-midonet.yaml | 2 +- .../neutron-compute-plugin-nuage.yaml | 2 +- .../neutron-compute-plugin-plumgrid.yaml | 2 +- puppet/services/neutron-dhcp.yaml | 2 +- puppet/services/neutron-l2gw-agent.yaml | 2 +- puppet/services/neutron-l2gw-api.yaml | 2 +- puppet/services/neutron-l3-compute-dvr.yaml | 2 +- puppet/services/neutron-l3.yaml | 2 +- puppet/services/neutron-lbaas-agent.yaml | 2 +- puppet/services/neutron-lbaas-api.yaml | 2 +- .../services/neutron-linuxbridge-agent.yaml | 2 +- puppet/services/neutron-metadata.yaml | 2 +- puppet/services/neutron-midonet.yaml | 2 +- puppet/services/neutron-ovs-agent.yaml | 2 +- puppet/services/neutron-ovs-dpdk-agent.yaml | 2 +- .../neutron-plugin-ml2-cisco-vts.yaml | 2 +- .../neutron-plugin-ml2-fujitsu-cfab.yaml | 2 +- .../neutron-plugin-ml2-fujitsu-fossw.yaml | 2 +- .../neutron-plugin-ml2-mlnx-sdn-assist.yaml | 2 +- puppet/services/neutron-plugin-ml2-nuage.yaml | 2 +- puppet/services/neutron-plugin-ml2-odl.yaml | 2 +- puppet/services/neutron-plugin-ml2-ovn.yaml | 2 +- puppet/services/neutron-plugin-ml2.yaml | 2 +- puppet/services/neutron-plugin-nsx.yaml | 2 +- puppet/services/neutron-plugin-nuage.yaml | 2 +- puppet/services/neutron-plugin-plumgrid.yaml | 2 +- puppet/services/neutron-sfc-api.yaml | 2 +- puppet/services/neutron-sriov-agent.yaml | 2 +- .../services/neutron-sriov-host-config.yaml | 2 +- puppet/services/neutron-vpp-agent.yaml | 2 +- puppet/services/nova-api.yaml | 2 +- puppet/services/nova-base.yaml | 2 +- puppet/services/nova-compute.yaml | 2 +- puppet/services/nova-conductor.yaml | 2 +- puppet/services/nova-consoleauth.yaml | 2 +- puppet/services/nova-ironic.yaml | 2 +- puppet/services/nova-libvirt.yaml | 2 +- puppet/services/nova-metadata.yaml | 2 +- puppet/services/nova-migration-target.yaml | 2 +- puppet/services/nova-placement.yaml | 2 +- puppet/services/nova-scheduler.yaml | 2 +- puppet/services/nova-vnc-proxy.yaml | 2 +- puppet/services/octavia-api.yaml | 2 +- puppet/services/octavia-base.yaml | 2 +- puppet/services/octavia-health-manager.yaml | 2 +- puppet/services/octavia-housekeeping.yaml | 2 +- puppet/services/octavia-worker.yaml | 2 +- puppet/services/opendaylight-api.yaml | 2 +- puppet/services/opendaylight-ovs.yaml | 2 +- puppet/services/openvswitch.yaml | 2 +- puppet/services/ovn-controller.yaml | 2 +- puppet/services/ovn-dbs.yaml | 2 +- puppet/services/ovn-metadata.yaml | 2 +- puppet/services/pacemaker.yaml | 2 +- puppet/services/pacemaker/ceph-rbdmirror.yaml | 2 +- puppet/services/pacemaker/cinder-backup.yaml | 2 +- puppet/services/pacemaker/cinder-volume.yaml | 2 +- .../pacemaker/compute-instanceha.yaml | 2 +- puppet/services/pacemaker/database/mysql.yaml | 2 +- puppet/services/pacemaker/database/redis.yaml | 2 +- puppet/services/pacemaker/haproxy.yaml | 2 +- puppet/services/pacemaker/manila-share.yaml | 2 +- puppet/services/pacemaker/ovn-dbs.yaml | 2 +- puppet/services/pacemaker/rabbitmq.yaml | 2 +- puppet/services/pacemaker_remote.yaml | 2 +- puppet/services/panko-api.yaml | 2 +- puppet/services/panko-base.yaml | 2 +- puppet/services/qdr.yaml | 2 +- puppet/services/rabbitmq.yaml | 2 +- puppet/services/sahara-api.yaml | 2 +- puppet/services/sahara-base.yaml | 2 +- puppet/services/sahara-engine.yaml | 2 +- puppet/services/securetty.yaml | 2 +- puppet/services/snmp.yaml | 2 +- puppet/services/sshd.yaml | 2 +- puppet/services/swift-base.yaml | 2 +- puppet/services/swift-dispersion.yaml | 2 +- puppet/services/swift-proxy.yaml | 2 +- puppet/services/swift-ringbuilder.yaml | 2 +- puppet/services/swift-storage.yaml | 2 +- puppet/services/tacker.yaml | 2 +- puppet/services/time/ntp.yaml | 2 +- puppet/services/time/ptp.yaml | 2 +- puppet/services/time/timezone.yaml | 2 +- puppet/services/tripleo-firewall.yaml | 2 +- puppet/services/tripleo-packages.yaml | 2 +- puppet/services/tripleo-ui.yaml | 2 +- puppet/services/tuned.yaml | 2 +- .../veritas-hyperscale-controller.yaml | 2 +- puppet/services/vpp.yaml | 2 +- puppet/services/zaqar-api.yaml | 2 +- tools/yaml-validate.py | 34 +++++++++++++++---- 492 files changed, 521 insertions(+), 496 deletions(-) diff --git a/all-nodes-validation.yaml b/all-nodes-validation.yaml index f736f22662..c80b7d08ba 100644 --- a/all-nodes-validation.yaml +++ b/all-nodes-validation.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive validations that occur on all nodes. diff --git a/bootstrap-config.yaml b/bootstrap-config.yaml index 548ff7434c..c80e3d9c52 100644 --- a/bootstrap-config.yaml +++ b/bootstrap-config.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: 'Bootstrap Config' parameters: diff --git a/ci/common/all-nodes-validation-disabled.yaml b/ci/common/all-nodes-validation-disabled.yaml index 004bd11852..6a2c5158f4 100644 --- a/ci/common/all-nodes-validation-disabled.yaml +++ b/ci/common/all-nodes-validation-disabled.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive validations that occur on all nodes. diff --git a/ci/common/net-config-multinode-os-net-config.yaml b/ci/common/net-config-multinode-os-net-config.yaml index 315594e7ea..24545c3aa7 100644 --- a/ci/common/net-config-multinode-os-net-config.yaml +++ b/ci/common/net-config-multinode-os-net-config.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive os-net-config for a simple bridge configured diff --git a/ci/common/net-config-multinode.yaml b/ci/common/net-config-multinode.yaml index 5cbf20e85e..6ba9cb9ead 100644 --- a/ci/common/net-config-multinode.yaml +++ b/ci/common/net-config-multinode.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive os-net-config for a simple bridge configured diff --git a/ci/common/net-config-simple-bridge.yaml b/ci/common/net-config-simple-bridge.yaml index 7176536f65..bbc88862b5 100644 --- a/ci/common/net-config-simple-bridge.yaml +++ b/ci/common/net-config-simple-bridge.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive os-net-config for a simple bridge. parameters: diff --git a/ci/environments/multinode-core.yaml b/ci/environments/multinode-core.yaml index 3e53650455..523cf1c995 100644 --- a/ci/environments/multinode-core.yaml +++ b/ci/environments/multinode-core.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Core Service diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/ceph-storage.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/ceph-storage.yaml index c8e2f1e1fa..6a37859079 100644 --- a/ci/environments/network/multiple-nics-ipv6/nic-configs/ceph-storage.yaml +++ b/ci/environments/network/multiple-nics-ipv6/nic-configs/ceph-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky parameters: ControlPlaneIp: diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/cinder-storage.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/cinder-storage.yaml index ebe220d0c1..0bdbbba321 100644 --- a/ci/environments/network/multiple-nics-ipv6/nic-configs/cinder-storage.yaml +++ b/ci/environments/network/multiple-nics-ipv6/nic-configs/cinder-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky parameters: ControlPlaneIp: diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml index bb1a2c040a..d8a91325c7 100644 --- a/ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml +++ b/ci/environments/network/multiple-nics-ipv6/nic-configs/compute.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky parameters: ControlPlaneIp: diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml index b57b3633f8..cc54f76121 100644 --- a/ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml +++ b/ci/environments/network/multiple-nics-ipv6/nic-configs/controller.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky parameters: ControlPlaneIp: diff --git a/ci/environments/network/multiple-nics-ipv6/nic-configs/swift-storage.yaml b/ci/environments/network/multiple-nics-ipv6/nic-configs/swift-storage.yaml index ebe220d0c1..0bdbbba321 100644 --- a/ci/environments/network/multiple-nics-ipv6/nic-configs/swift-storage.yaml +++ b/ci/environments/network/multiple-nics-ipv6/nic-configs/swift-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky parameters: ControlPlaneIp: diff --git a/ci/environments/network/multiple-nics/nic-configs/ceph-storage.yaml b/ci/environments/network/multiple-nics/nic-configs/ceph-storage.yaml index 197db280fe..26de71f81e 100644 --- a/ci/environments/network/multiple-nics/nic-configs/ceph-storage.yaml +++ b/ci/environments/network/multiple-nics/nic-configs/ceph-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky parameters: ControlPlaneIp: diff --git a/ci/environments/network/multiple-nics/nic-configs/cinder-storage.yaml b/ci/environments/network/multiple-nics/nic-configs/cinder-storage.yaml index 8cab330f47..ec036bbc6a 100644 --- a/ci/environments/network/multiple-nics/nic-configs/cinder-storage.yaml +++ b/ci/environments/network/multiple-nics/nic-configs/cinder-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky parameters: ControlPlaneIp: diff --git a/ci/environments/network/multiple-nics/nic-configs/compute.yaml b/ci/environments/network/multiple-nics/nic-configs/compute.yaml index 6d274af8e1..1da83cfd0b 100644 --- a/ci/environments/network/multiple-nics/nic-configs/compute.yaml +++ b/ci/environments/network/multiple-nics/nic-configs/compute.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky parameters: ControlPlaneIp: diff --git a/ci/environments/network/multiple-nics/nic-configs/controller.yaml b/ci/environments/network/multiple-nics/nic-configs/controller.yaml index d405142736..09c6d01be9 100644 --- a/ci/environments/network/multiple-nics/nic-configs/controller.yaml +++ b/ci/environments/network/multiple-nics/nic-configs/controller.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky parameters: ControlPlaneIp: diff --git a/ci/environments/network/multiple-nics/nic-configs/swift-storage.yaml b/ci/environments/network/multiple-nics/nic-configs/swift-storage.yaml index 8cab330f47..ec036bbc6a 100644 --- a/ci/environments/network/multiple-nics/nic-configs/swift-storage.yaml +++ b/ci/environments/network/multiple-nics/nic-configs/swift-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky parameters: ControlPlaneIp: diff --git a/ci/environments/network/public-bond/nic-configs/ceph-storage.yaml b/ci/environments/network/public-bond/nic-configs/ceph-storage.yaml index 75f37fea72..623c31e3d4 100644 --- a/ci/environments/network/public-bond/nic-configs/ceph-storage.yaml +++ b/ci/environments/network/public-bond/nic-configs/ceph-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: rocky parameters: ControlPlaneIp: diff --git a/ci/environments/network/public-bond/nic-configs/cinder-storage.yaml b/ci/environments/network/public-bond/nic-configs/cinder-storage.yaml index 3ee0da0771..1cf2f6a3d1 100644 --- a/ci/environments/network/public-bond/nic-configs/cinder-storage.yaml +++ b/ci/environments/network/public-bond/nic-configs/cinder-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: rocky parameters: ControlPlaneIp: diff --git a/ci/environments/network/public-bond/nic-configs/compute.yaml b/ci/environments/network/public-bond/nic-configs/compute.yaml index e6ab3cf0f4..d4084aa867 100644 --- a/ci/environments/network/public-bond/nic-configs/compute.yaml +++ b/ci/environments/network/public-bond/nic-configs/compute.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: rocky parameters: ControlPlaneIp: diff --git a/ci/environments/network/public-bond/nic-configs/controller.yaml b/ci/environments/network/public-bond/nic-configs/controller.yaml index 9727c0ff65..9ed1578c1a 100644 --- a/ci/environments/network/public-bond/nic-configs/controller.yaml +++ b/ci/environments/network/public-bond/nic-configs/controller.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: rocky parameters: ControlPlaneIp: diff --git a/ci/environments/network/public-bond/nic-configs/swift-storage.yaml b/ci/environments/network/public-bond/nic-configs/swift-storage.yaml index 3ee0da0771..1cf2f6a3d1 100644 --- a/ci/environments/network/public-bond/nic-configs/swift-storage.yaml +++ b/ci/environments/network/public-bond/nic-configs/swift-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: rocky parameters: ControlPlaneIp: diff --git a/ci/pingtests/tenantvm_floatingip.yaml b/ci/pingtests/tenantvm_floatingip.yaml index e4ff174707..db8dede08f 100644 --- a/ci/pingtests/tenantvm_floatingip.yaml +++ b/ci/pingtests/tenantvm_floatingip.yaml @@ -1,5 +1,8 @@ heat_template_version: ocata # Keep the template version old enough to support older release testing. +# In mixed version test scenario, we can have a ping test triggered +# after the overcloud installation just to make sure that it works. +# If we move this template version then this scenario cannot work. description: > HOT template to create a new neutron network plus a router to the public diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index 975ddfaacc..11366a0518 100644 --- a/common/deploy-steps.j2 +++ b/common/deploy-steps.j2 @@ -23,7 +23,7 @@ {% set fast_forward_upgrade_prep_steps_max = 3 -%} {% set post_update_steps_max = 4 -%} -heat_template_version: queens +heat_template_version: rocky description: > Post-deploy configuration steps via puppet for all roles, diff --git a/common/services.yaml b/common/services.yaml index 2bfab14cc6..19c60774ae 100644 --- a/common/services.yaml +++ b/common/services.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky 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 c0b3e40d0d..98982ce2a8 100644 --- a/config-download-software.yaml +++ b/config-download-software.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky parameters: diff --git a/config-download-structured.yaml b/config-download-structured.yaml index b2ca223d1e..541d85e793 100644 --- a/config-download-structured.yaml +++ b/config-download-structured.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky parameters: diff --git a/default_passwords.yaml b/default_passwords.yaml index 3fddd5ddd9..6ed3563135 100644 --- a/default_passwords.yaml +++ b/default_passwords.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: Passwords we manage at the top level diff --git a/deployed-server/ctlplane-port.yaml b/deployed-server/ctlplane-port.yaml index 8cda15a11f..92ac4042dc 100644 --- a/deployed-server/ctlplane-port.yaml +++ b/deployed-server/ctlplane-port.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky parameters: network: diff --git a/deployed-server/deployed-neutron-port.yaml b/deployed-server/deployed-neutron-port.yaml index e598bcefb6..a128e2a0ee 100644 --- a/deployed-server/deployed-neutron-port.yaml +++ b/deployed-server/deployed-neutron-port.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: " A fake OS::Neutron::Port stack which outputs fixed_ips and subnets based on diff --git a/deployed-server/deployed-server-bootstrap-centos.yaml b/deployed-server/deployed-server-bootstrap-centos.yaml index 8bda4eef00..f68e3f9260 100644 --- a/deployed-server/deployed-server-bootstrap-centos.yaml +++ b/deployed-server/deployed-server-bootstrap-centos.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: 'Deployed Server Bootstrap Config' diff --git a/deployed-server/deployed-server-bootstrap-rhel.yaml b/deployed-server/deployed-server-bootstrap-rhel.yaml index 52f8e3fe35..6b10951e08 100644 --- a/deployed-server/deployed-server-bootstrap-rhel.yaml +++ b/deployed-server/deployed-server-bootstrap-rhel.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: 'Deployed Server Bootstrap Config' diff --git a/deployed-server/deployed-server-environment-output.yaml b/deployed-server/deployed-server-environment-output.yaml index 89460f9971..32faea72d8 100644 --- a/deployed-server/deployed-server-environment-output.yaml +++ b/deployed-server/deployed-server-environment-output.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky parameters: RoleCounts: diff --git a/deployed-server/deployed-server.yaml b/deployed-server/deployed-server.yaml index 7477bb82f8..7fc1862c1d 100644 --- a/deployed-server/deployed-server.yaml +++ b/deployed-server/deployed-server.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky parameters: image: type: string diff --git a/docker/services/aodh-api.yaml b/docker/services/aodh-api.yaml index d63f4c10a7..10ddb19048 100644 --- a/docker/services/aodh-api.yaml +++ b/docker/services/aodh-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized aodh service diff --git a/docker/services/aodh-evaluator.yaml b/docker/services/aodh-evaluator.yaml index fa1c18a1fb..a1233b2207 100644 --- a/docker/services/aodh-evaluator.yaml +++ b/docker/services/aodh-evaluator.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Aodh Evaluator service diff --git a/docker/services/aodh-listener.yaml b/docker/services/aodh-listener.yaml index b0c8472260..ac2bf6872b 100644 --- a/docker/services/aodh-listener.yaml +++ b/docker/services/aodh-listener.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Aodh Listener service diff --git a/docker/services/aodh-notifier.yaml b/docker/services/aodh-notifier.yaml index ebab2f07cf..04d7e6a8ab 100644 --- a/docker/services/aodh-notifier.yaml +++ b/docker/services/aodh-notifier.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Aodh Notifier service diff --git a/docker/services/barbican-api.yaml b/docker/services/barbican-api.yaml index cbb735602f..fbe18b7b4f 100644 --- a/docker/services/barbican-api.yaml +++ b/docker/services/barbican-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Barbican API service diff --git a/docker/services/ceilometer-agent-central.yaml b/docker/services/ceilometer-agent-central.yaml index 916fee45ab..37ec60f6e3 100644 --- a/docker/services/ceilometer-agent-central.yaml +++ b/docker/services/ceilometer-agent-central.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Ceilometer Agent Central service diff --git a/docker/services/ceilometer-agent-compute.yaml b/docker/services/ceilometer-agent-compute.yaml index 8e15c7893b..1b5b9aa082 100644 --- a/docker/services/ceilometer-agent-compute.yaml +++ b/docker/services/ceilometer-agent-compute.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Ceilometer Agent Compute service diff --git a/docker/services/ceilometer-agent-ipmi.yaml b/docker/services/ceilometer-agent-ipmi.yaml index 50b14c963c..414fd79027 100644 --- a/docker/services/ceilometer-agent-ipmi.yaml +++ b/docker/services/ceilometer-agent-ipmi.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Ceilometer Agent Ipmi service diff --git a/docker/services/ceilometer-agent-notification.yaml b/docker/services/ceilometer-agent-notification.yaml index 25fde8262b..0e9c64b6ee 100644 --- a/docker/services/ceilometer-agent-notification.yaml +++ b/docker/services/ceilometer-agent-notification.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Ceilometer Agent Notification service diff --git a/docker/services/ceph-ansible/ceph-base.yaml b/docker/services/ceph-ansible/ceph-base.yaml index c0582cf9f0..34bc3c580c 100644 --- a/docker/services/ceph-ansible/ceph-base.yaml +++ b/docker/services/ceph-ansible/ceph-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Ceph base service. Shared by all Ceph services. diff --git a/docker/services/ceph-ansible/ceph-client.yaml b/docker/services/ceph-ansible/ceph-client.yaml index 9b3a9bff79..a14bc29f68 100644 --- a/docker/services/ceph-ansible/ceph-client.yaml +++ b/docker/services/ceph-ansible/ceph-client.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Ceph Client service. diff --git a/docker/services/ceph-ansible/ceph-external.yaml b/docker/services/ceph-ansible/ceph-external.yaml index cc4bb13247..8504d65766 100644 --- a/docker/services/ceph-ansible/ceph-external.yaml +++ b/docker/services/ceph-ansible/ceph-external.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Ceph External service. diff --git a/docker/services/ceph-ansible/ceph-mds.yaml b/docker/services/ceph-ansible/ceph-mds.yaml index 17019ce90d..97bd1f6ecd 100644 --- a/docker/services/ceph-ansible/ceph-mds.yaml +++ b/docker/services/ceph-ansible/ceph-mds.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Ceph Metadata service. diff --git a/docker/services/ceph-ansible/ceph-mgr.yaml b/docker/services/ceph-ansible/ceph-mgr.yaml index 46c9bcb65e..76ac1e575c 100644 --- a/docker/services/ceph-ansible/ceph-mgr.yaml +++ b/docker/services/ceph-ansible/ceph-mgr.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Ceph Manager service. diff --git a/docker/services/ceph-ansible/ceph-mon.yaml b/docker/services/ceph-ansible/ceph-mon.yaml index 91e59e5354..a11e0c5b6c 100644 --- a/docker/services/ceph-ansible/ceph-mon.yaml +++ b/docker/services/ceph-ansible/ceph-mon.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Ceph Monitor service. diff --git a/docker/services/ceph-ansible/ceph-nfs.yaml b/docker/services/ceph-ansible/ceph-nfs.yaml index 42f3a30ead..1660427af4 100644 --- a/docker/services/ceph-ansible/ceph-nfs.yaml +++ b/docker/services/ceph-ansible/ceph-nfs.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: rocky description: > Ceph NFS Ganeshaservice. diff --git a/docker/services/ceph-ansible/ceph-osd.yaml b/docker/services/ceph-ansible/ceph-osd.yaml index ab418016ee..5972b7d6fc 100644 --- a/docker/services/ceph-ansible/ceph-osd.yaml +++ b/docker/services/ceph-ansible/ceph-osd.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Ceph OSD service. diff --git a/docker/services/ceph-ansible/ceph-rbdmirror.yaml b/docker/services/ceph-ansible/ceph-rbdmirror.yaml index 04c5feb0e7..36605ba54c 100644 --- a/docker/services/ceph-ansible/ceph-rbdmirror.yaml +++ b/docker/services/ceph-ansible/ceph-rbdmirror.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Ceph RBD Mirror service. diff --git a/docker/services/ceph-ansible/ceph-rgw.yaml b/docker/services/ceph-ansible/ceph-rgw.yaml index 14fd007200..d3077cc209 100644 --- a/docker/services/ceph-ansible/ceph-rgw.yaml +++ b/docker/services/ceph-ansible/ceph-rgw.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Ceph RadosGW service. diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml index 2044e09483..3047fe9b6b 100644 --- a/docker/services/cinder-api.yaml +++ b/docker/services/cinder-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Cinder API service diff --git a/docker/services/cinder-backup.yaml b/docker/services/cinder-backup.yaml index 153fe90f29..4b6d14f26c 100644 --- a/docker/services/cinder-backup.yaml +++ b/docker/services/cinder-backup.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Cinder Backup service diff --git a/docker/services/cinder-common.yaml b/docker/services/cinder-common.yaml index d843dbd929..9c663efb03 100644 --- a/docker/services/cinder-common.yaml +++ b/docker/services/cinder-common.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Provides the list of Docker volumes and environment to be used by the diff --git a/docker/services/cinder-scheduler.yaml b/docker/services/cinder-scheduler.yaml index e946c91f10..dc84ea8f6c 100644 --- a/docker/services/cinder-scheduler.yaml +++ b/docker/services/cinder-scheduler.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Cinder Scheduler service diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml index de44ade5da..feb5ddc1e8 100644 --- a/docker/services/cinder-volume.yaml +++ b/docker/services/cinder-volume.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Cinder Volume service diff --git a/docker/services/collectd.yaml b/docker/services/collectd.yaml index c38ce44149..069777a406 100644 --- a/docker/services/collectd.yaml +++ b/docker/services/collectd.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Containerized collectd service diff --git a/docker/services/congress.yaml b/docker/services/congress.yaml index c15e6f6af2..ecf3953b79 100644 --- a/docker/services/congress.yaml +++ b/docker/services/congress.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Congress API service diff --git a/docker/services/containers-common.yaml b/docker/services/containers-common.yaml index 46c60cc764..4ca608ff5b 100644 --- a/docker/services/containers-common.yaml +++ b/docker/services/containers-common.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Contains a static list of common things necessary for containers diff --git a/docker/services/database/mongodb.yaml b/docker/services/database/mongodb.yaml index 2ef6d865b3..902a4e6066 100644 --- a/docker/services/database/mongodb.yaml +++ b/docker/services/database/mongodb.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > MongoDB service deployment using puppet and docker diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml index 028a75ac05..f97d3b7d82 100644 --- a/docker/services/database/mysql.yaml +++ b/docker/services/database/mysql.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > MySQL service deployment using puppet diff --git a/docker/services/database/redis.yaml b/docker/services/database/redis.yaml index cf199e6752..380943e821 100644 --- a/docker/services/database/redis.yaml +++ b/docker/services/database/redis.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Redis services diff --git a/docker/services/designate-api.yaml b/docker/services/designate-api.yaml index b05fb79a9a..e576bfd591 100644 --- a/docker/services/designate-api.yaml +++ b/docker/services/designate-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Designate API service diff --git a/docker/services/designate-central.yaml b/docker/services/designate-central.yaml index 4f2a197daf..6cec04120b 100644 --- a/docker/services/designate-central.yaml +++ b/docker/services/designate-central.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Designate Central service diff --git a/docker/services/designate-mdns.yaml b/docker/services/designate-mdns.yaml index 4106170c16..94b3782009 100644 --- a/docker/services/designate-mdns.yaml +++ b/docker/services/designate-mdns.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Designate MiniDNS service diff --git a/docker/services/designate-producer.yaml b/docker/services/designate-producer.yaml index 5209e80b50..1f050086c7 100644 --- a/docker/services/designate-producer.yaml +++ b/docker/services/designate-producer.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Designate Producer service diff --git a/docker/services/designate-sink.yaml b/docker/services/designate-sink.yaml index 627561b7ee..a9d901062a 100644 --- a/docker/services/designate-sink.yaml +++ b/docker/services/designate-sink.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Designate Sink service diff --git a/docker/services/designate-worker.yaml b/docker/services/designate-worker.yaml index 25ada68964..d8482c3b99 100644 --- a/docker/services/designate-worker.yaml +++ b/docker/services/designate-worker.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Designate Worker service diff --git a/docker/services/ec2-api.yaml b/docker/services/ec2-api.yaml index 9c2551a3d8..87ec514fa3 100644 --- a/docker/services/ec2-api.yaml +++ b/docker/services/ec2-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized EC2 API service diff --git a/docker/services/etcd.yaml b/docker/services/etcd.yaml index 11e776ca12..2af75efcbc 100644 --- a/docker/services/etcd.yaml +++ b/docker/services/etcd.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized etcd services diff --git a/docker/services/fluentd.yaml b/docker/services/fluentd.yaml index 959e735d48..e15ea8ab2d 100644 --- a/docker/services/fluentd.yaml +++ b/docker/services/fluentd.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized fluentd services diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml index 3eec205390..9cb41e7ac8 100644 --- a/docker/services/glance-api.yaml +++ b/docker/services/glance-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Glance service configured with Puppet diff --git a/docker/services/gnocchi-api.yaml b/docker/services/gnocchi-api.yaml index 2ebe5b35a3..dbec26fb62 100644 --- a/docker/services/gnocchi-api.yaml +++ b/docker/services/gnocchi-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized gnocchi service diff --git a/docker/services/gnocchi-metricd.yaml b/docker/services/gnocchi-metricd.yaml index e8d4ae2093..fa5237204a 100644 --- a/docker/services/gnocchi-metricd.yaml +++ b/docker/services/gnocchi-metricd.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Gnocchi Metricd service diff --git a/docker/services/gnocchi-statsd.yaml b/docker/services/gnocchi-statsd.yaml index 2b0bc61042..6bc5c54c23 100644 --- a/docker/services/gnocchi-statsd.yaml +++ b/docker/services/gnocchi-statsd.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Gnocchi Statsd service diff --git a/docker/services/haproxy.yaml b/docker/services/haproxy.yaml index 62d7a3b5b1..7344db56f4 100644 --- a/docker/services/haproxy.yaml +++ b/docker/services/haproxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized HAproxy service diff --git a/docker/services/heat-api-cfn.yaml b/docker/services/heat-api-cfn.yaml index 702dee9ac7..ac20f81c27 100644 --- a/docker/services/heat-api-cfn.yaml +++ b/docker/services/heat-api-cfn.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Heat API CFN service diff --git a/docker/services/heat-api.yaml b/docker/services/heat-api.yaml index 679bb8e140..86d7fe9219 100644 --- a/docker/services/heat-api.yaml +++ b/docker/services/heat-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Heat API service diff --git a/docker/services/heat-engine.yaml b/docker/services/heat-engine.yaml index 3c8c7335d2..6f94a49d96 100644 --- a/docker/services/heat-engine.yaml +++ b/docker/services/heat-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Heat Engine service diff --git a/docker/services/horizon.yaml b/docker/services/horizon.yaml index d234476404..91ca73896c 100644 --- a/docker/services/horizon.yaml +++ b/docker/services/horizon.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Horizon service diff --git a/docker/services/ironic-api.yaml b/docker/services/ironic-api.yaml index 40f5496fc1..39e8907a12 100644 --- a/docker/services/ironic-api.yaml +++ b/docker/services/ironic-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Ironic API service diff --git a/docker/services/ironic-conductor.yaml b/docker/services/ironic-conductor.yaml index 6cb5ec8548..089a1a14a6 100644 --- a/docker/services/ironic-conductor.yaml +++ b/docker/services/ironic-conductor.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Ironic Conductor service diff --git a/docker/services/ironic-inspector.yaml b/docker/services/ironic-inspector.yaml index 3d64f9383d..3c10ea2982 100644 --- a/docker/services/ironic-inspector.yaml +++ b/docker/services/ironic-inspector.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Ironic Inspector service (EXPERIMENTAL) diff --git a/docker/services/ironic-neutron-agent.yaml b/docker/services/ironic-neutron-agent.yaml index 98a024d05c..5777b0f7be 100644 --- a/docker/services/ironic-neutron-agent.yaml +++ b/docker/services/ironic-neutron-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack ironic-neutron-agent service diff --git a/docker/services/ironic-pxe.yaml b/docker/services/ironic-pxe.yaml index e3983fc8ed..2f755a3e0d 100644 --- a/docker/services/ironic-pxe.yaml +++ b/docker/services/ironic-pxe.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Ironic PXE service diff --git a/docker/services/iscsid.yaml b/docker/services/iscsid.yaml index a4b1a3e4fc..bef21f08ba 100644 --- a/docker/services/iscsid.yaml +++ b/docker/services/iscsid.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Iscsid service diff --git a/docker/services/keepalived.yaml b/docker/services/keepalived.yaml index 5654b0b81f..2b1b273f55 100644 --- a/docker/services/keepalived.yaml +++ b/docker/services/keepalived.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Keepalived service diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml index 6078d96b7c..f6a48c4b36 100644 --- a/docker/services/keystone.yaml +++ b/docker/services/keystone.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Keystone service diff --git a/docker/services/logging/files/barbican-api.yaml b/docker/services/logging/files/barbican-api.yaml index 343f3992b0..5bbb326ab4 100644 --- a/docker/services/logging/files/barbican-api.yaml +++ b/docker/services/logging/files/barbican-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Barbican API service diff --git a/docker/services/logging/files/glance-api.yaml b/docker/services/logging/files/glance-api.yaml index 2b70e73736..cacb732373 100644 --- a/docker/services/logging/files/glance-api.yaml +++ b/docker/services/logging/files/glance-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Glance API service diff --git a/docker/services/logging/files/haproxy.yaml b/docker/services/logging/files/haproxy.yaml index 46fe420449..cf2b278811 100644 --- a/docker/services/logging/files/haproxy.yaml +++ b/docker/services/logging/files/haproxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized HAProxy API service diff --git a/docker/services/logging/files/heat-api-cfn.yaml b/docker/services/logging/files/heat-api-cfn.yaml index 4fc8a703dc..b69c7f157a 100644 --- a/docker/services/logging/files/heat-api-cfn.yaml +++ b/docker/services/logging/files/heat-api-cfn.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Heat API CFN service diff --git a/docker/services/logging/files/heat-api.yaml b/docker/services/logging/files/heat-api.yaml index d47b0f6165..13e7763f3f 100644 --- a/docker/services/logging/files/heat-api.yaml +++ b/docker/services/logging/files/heat-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Heat API service diff --git a/docker/services/logging/files/heat-engine.yaml b/docker/services/logging/files/heat-engine.yaml index 38d02380ab..9d9ef45290 100644 --- a/docker/services/logging/files/heat-engine.yaml +++ b/docker/services/logging/files/heat-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Glance API service diff --git a/docker/services/logging/files/keystone.yaml b/docker/services/logging/files/keystone.yaml index 632f938f47..32065e7518 100644 --- a/docker/services/logging/files/keystone.yaml +++ b/docker/services/logging/files/keystone.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Keystone service diff --git a/docker/services/logging/files/neutron-api.yaml b/docker/services/logging/files/neutron-api.yaml index 4a7a058760..b727460b11 100644 --- a/docker/services/logging/files/neutron-api.yaml +++ b/docker/services/logging/files/neutron-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Neutron API service diff --git a/docker/services/logging/files/neutron-common.yaml b/docker/services/logging/files/neutron-common.yaml index 077d991037..5d2cd6e278 100644 --- a/docker/services/logging/files/neutron-common.yaml +++ b/docker/services/logging/files/neutron-common.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Neutron service diff --git a/docker/services/logging/files/nova-api.yaml b/docker/services/logging/files/nova-api.yaml index 86c21df958..0076da93b7 100644 --- a/docker/services/logging/files/nova-api.yaml +++ b/docker/services/logging/files/nova-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Template for nova-api's logging to files diff --git a/docker/services/logging/files/nova-common.yaml b/docker/services/logging/files/nova-common.yaml index 2dc19cd1da..ade8157a3e 100644 --- a/docker/services/logging/files/nova-common.yaml +++ b/docker/services/logging/files/nova-common.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Template for nova's logging to files diff --git a/docker/services/logging/files/nova-placement.yaml b/docker/services/logging/files/nova-placement.yaml index b8b5805ac6..5f9f7f2f11 100644 --- a/docker/services/logging/files/nova-placement.yaml +++ b/docker/services/logging/files/nova-placement.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Template for nova-placement's logging to files diff --git a/docker/services/logging/files/panko-api.yaml b/docker/services/logging/files/panko-api.yaml index 996114bd77..ef2e13ede0 100644 --- a/docker/services/logging/files/panko-api.yaml +++ b/docker/services/logging/files/panko-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Panko service diff --git a/docker/services/logging/stdout/barbican-api.yaml b/docker/services/logging/stdout/barbican-api.yaml index 5ec7326aef..e557c00236 100644 --- a/docker/services/logging/stdout/barbican-api.yaml +++ b/docker/services/logging/stdout/barbican-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Barbican service diff --git a/docker/services/logging/stdout/glance-api.yaml b/docker/services/logging/stdout/glance-api.yaml index 7ca6415b85..2c8b6636cf 100644 --- a/docker/services/logging/stdout/glance-api.yaml +++ b/docker/services/logging/stdout/glance-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Glance API service diff --git a/docker/services/logging/stdout/haproxy.yaml b/docker/services/logging/stdout/haproxy.yaml index d9ffdf210e..8f449ea6ea 100644 --- a/docker/services/logging/stdout/haproxy.yaml +++ b/docker/services/logging/stdout/haproxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized HAProxy API service diff --git a/docker/services/logging/stdout/heat-api-cfn.yaml b/docker/services/logging/stdout/heat-api-cfn.yaml index 9fb75f9aa7..1a121afe5c 100644 --- a/docker/services/logging/stdout/heat-api-cfn.yaml +++ b/docker/services/logging/stdout/heat-api-cfn.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Heat API CFN service diff --git a/docker/services/logging/stdout/heat-api.yaml b/docker/services/logging/stdout/heat-api.yaml index 5a0fcc34d7..51a81ef704 100644 --- a/docker/services/logging/stdout/heat-api.yaml +++ b/docker/services/logging/stdout/heat-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Heat API service diff --git a/docker/services/logging/stdout/heat-engine.yaml b/docker/services/logging/stdout/heat-engine.yaml index e286727ea3..c8df4ad1de 100644 --- a/docker/services/logging/stdout/heat-engine.yaml +++ b/docker/services/logging/stdout/heat-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Glance API service diff --git a/docker/services/logging/stdout/keystone.yaml b/docker/services/logging/stdout/keystone.yaml index 67bec4d25e..e087fa4477 100644 --- a/docker/services/logging/stdout/keystone.yaml +++ b/docker/services/logging/stdout/keystone.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Keystone service diff --git a/docker/services/logging/stdout/neutron-common.yaml b/docker/services/logging/stdout/neutron-common.yaml index c4fa8e1a90..45bf7eda9f 100644 --- a/docker/services/logging/stdout/neutron-common.yaml +++ b/docker/services/logging/stdout/neutron-common.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Neutron API service diff --git a/docker/services/logging/stdout/nova-api.yaml b/docker/services/logging/stdout/nova-api.yaml index 90c84cf9e5..2821ce1b99 100644 --- a/docker/services/logging/stdout/nova-api.yaml +++ b/docker/services/logging/stdout/nova-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Template for nova-api's logging to stdout diff --git a/docker/services/logging/stdout/nova-common.yaml b/docker/services/logging/stdout/nova-common.yaml index 731856948f..beb1cd98e3 100644 --- a/docker/services/logging/stdout/nova-common.yaml +++ b/docker/services/logging/stdout/nova-common.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Template for nova's logging to stdout diff --git a/docker/services/logging/stdout/nova-libvirt.yaml b/docker/services/logging/stdout/nova-libvirt.yaml index d39b38e542..227e94e1e2 100644 --- a/docker/services/logging/stdout/nova-libvirt.yaml +++ b/docker/services/logging/stdout/nova-libvirt.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Nova libvirt service diff --git a/docker/services/logging/stdout/nova-placement.yaml b/docker/services/logging/stdout/nova-placement.yaml index 6113e00608..e7e3cf6982 100644 --- a/docker/services/logging/stdout/nova-placement.yaml +++ b/docker/services/logging/stdout/nova-placement.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Template for nova-placement's logging to stdout diff --git a/docker/services/logging/stdout/panko-api.yaml b/docker/services/logging/stdout/panko-api.yaml index 84e40613b4..3b499ee847 100644 --- a/docker/services/logging/stdout/panko-api.yaml +++ b/docker/services/logging/stdout/panko-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Keystone service diff --git a/docker/services/logrotate-crond.yaml b/docker/services/logrotate-crond.yaml index 1f1f4b13a2..f314f96ecd 100644 --- a/docker/services/logrotate-crond.yaml +++ b/docker/services/logrotate-crond.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Containerized logrotate with crond for containerized service logs rotation diff --git a/docker/services/manila-api.yaml b/docker/services/manila-api.yaml index 66348b26ae..7f06f158b4 100644 --- a/docker/services/manila-api.yaml +++ b/docker/services/manila-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Manila API service diff --git a/docker/services/manila-scheduler.yaml b/docker/services/manila-scheduler.yaml index fd0c28c15e..0277c06004 100644 --- a/docker/services/manila-scheduler.yaml +++ b/docker/services/manila-scheduler.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Manila Scheduler service diff --git a/docker/services/manila-share.yaml b/docker/services/manila-share.yaml index ed1d902fe3..0a27c62711 100644 --- a/docker/services/manila-share.yaml +++ b/docker/services/manila-share.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Manila Share service diff --git a/docker/services/memcached.yaml b/docker/services/memcached.yaml index a73a84d140..4bbac0dec3 100644 --- a/docker/services/memcached.yaml +++ b/docker/services/memcached.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Memcached services diff --git a/docker/services/messaging/notify-rabbitmq-shared.yaml b/docker/services/messaging/notify-rabbitmq-shared.yaml index 70be8c316f..bda313e604 100644 --- a/docker/services/messaging/notify-rabbitmq-shared.yaml +++ b/docker/services/messaging/notify-rabbitmq-shared.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Oslo Notify using a shared OpenStack containerized Rabbitmq service diff --git a/docker/services/messaging/notify-rabbitmq.yaml b/docker/services/messaging/notify-rabbitmq.yaml index b4e8c17820..13ef0dfd56 100644 --- a/docker/services/messaging/notify-rabbitmq.yaml +++ b/docker/services/messaging/notify-rabbitmq.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Rabbitmq service diff --git a/docker/services/messaging/rpc-qdrouterd.yaml b/docker/services/messaging/rpc-qdrouterd.yaml index 3c5847ee3f..6428177d4c 100644 --- a/docker/services/messaging/rpc-qdrouterd.yaml +++ b/docker/services/messaging/rpc-qdrouterd.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Qpid dispatch router service diff --git a/docker/services/messaging/rpc-rabbitmq.yaml b/docker/services/messaging/rpc-rabbitmq.yaml index 7fe79eec1f..15c2725d62 100644 --- a/docker/services/messaging/rpc-rabbitmq.yaml +++ b/docker/services/messaging/rpc-rabbitmq.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Rabbitmq service diff --git a/docker/services/mistral-api.yaml b/docker/services/mistral-api.yaml index abf6cf148b..0b14bd3afa 100644 --- a/docker/services/mistral-api.yaml +++ b/docker/services/mistral-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Mistral API service diff --git a/docker/services/mistral-engine.yaml b/docker/services/mistral-engine.yaml index afd7c419ed..f3f2d7d848 100644 --- a/docker/services/mistral-engine.yaml +++ b/docker/services/mistral-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Mistral Engine service diff --git a/docker/services/mistral-event-engine.yaml b/docker/services/mistral-event-engine.yaml index f5c271032f..f0e28dfaaa 100644 --- a/docker/services/mistral-event-engine.yaml +++ b/docker/services/mistral-event-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Mistral Event Engine service diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml index 1c7c0c70e4..1a9bf49606 100644 --- a/docker/services/mistral-executor.yaml +++ b/docker/services/mistral-executor.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Mistral Executor service diff --git a/docker/services/multipathd.yaml b/docker/services/multipathd.yaml index 2e7d80c60f..5d8f768626 100644 --- a/docker/services/multipathd.yaml +++ b/docker/services/multipathd.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Multipathd service diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml index 3d67d623ef..2a44dea3da 100644 --- a/docker/services/neutron-api.yaml +++ b/docker/services/neutron-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Neutron API service diff --git a/docker/services/neutron-bgpvpn-api.yaml b/docker/services/neutron-bgpvpn-api.yaml index 67cffad60e..a7f4fb89ef 100644 --- a/docker/services/neutron-bgpvpn-api.yaml +++ b/docker/services/neutron-bgpvpn-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > BGPVPN API service configured with Puppet diff --git a/docker/services/neutron-dhcp.yaml b/docker/services/neutron-dhcp.yaml index 02811fc806..d1868b49f1 100644 --- a/docker/services/neutron-dhcp.yaml +++ b/docker/services/neutron-dhcp.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Neutron DHCP service diff --git a/docker/services/neutron-l2gw-api.yaml b/docker/services/neutron-l2gw-api.yaml index 8fe38a4ec1..e8f214a934 100644 --- a/docker/services/neutron-l2gw-api.yaml +++ b/docker/services/neutron-l2gw-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Containerized L2GW Service Plugin diff --git a/docker/services/neutron-l3.yaml b/docker/services/neutron-l3.yaml index a3878703cb..8dc79db6d7 100644 --- a/docker/services/neutron-l3.yaml +++ b/docker/services/neutron-l3.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Neutron L3 agent diff --git a/docker/services/neutron-lbaas-api.yaml b/docker/services/neutron-lbaas-api.yaml index d9658375bd..2215090b5d 100644 --- a/docker/services/neutron-lbaas-api.yaml +++ b/docker/services/neutron-lbaas-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Containerized LBaaS Service Plugin diff --git a/docker/services/neutron-metadata.yaml b/docker/services/neutron-metadata.yaml index 7968ed5c31..accce0db9d 100644 --- a/docker/services/neutron-metadata.yaml +++ b/docker/services/neutron-metadata.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Neutron Metadata agent diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml index b04d9e2a64..7b500d9550 100644 --- a/docker/services/neutron-ovs-agent.yaml +++ b/docker/services/neutron-ovs-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron openvswitch service diff --git a/docker/services/neutron-ovs-dpdk-agent.yaml b/docker/services/neutron-ovs-dpdk-agent.yaml index ecba9f988c..d0adbf4667 100644 --- a/docker/services/neutron-ovs-dpdk-agent.yaml +++ b/docker/services/neutron-ovs-dpdk-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron OVS DPDK configured with Puppet for Compute Role (Containerized) diff --git a/docker/services/neutron-plugin-ml2-cisco-vts.yaml b/docker/services/neutron-plugin-ml2-cisco-vts.yaml index 2162adfc35..acc2066d3f 100644 --- a/docker/services/neutron-plugin-ml2-cisco-vts.yaml +++ b/docker/services/neutron-plugin-ml2-cisco-vts.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > VTS Controller Settings for Neutron ML2 Plugin (Docker) diff --git a/docker/services/neutron-plugin-ml2.yaml b/docker/services/neutron-plugin-ml2.yaml index 1978123941..9ff2742d01 100644 --- a/docker/services/neutron-plugin-ml2.yaml +++ b/docker/services/neutron-plugin-ml2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Neutron ML2 Plugin configured with Puppet diff --git a/docker/services/neutron-sriov-agent.yaml b/docker/services/neutron-sriov-agent.yaml index 2872097c19..475b37a952 100644 --- a/docker/services/neutron-sriov-agent.yaml +++ b/docker/services/neutron-sriov-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron SR-IOV service diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml index 258ae5041c..f6b08ebcc3 100644 --- a/docker/services/nova-api.yaml +++ b/docker/services/nova-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Nova API service diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml index f1c2dfaa7b..009164050a 100644 --- a/docker/services/nova-compute.yaml +++ b/docker/services/nova-compute.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Nova Compute service diff --git a/docker/services/nova-conductor.yaml b/docker/services/nova-conductor.yaml index 61ad10c694..badf7ac6cb 100644 --- a/docker/services/nova-conductor.yaml +++ b/docker/services/nova-conductor.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Nova Conductor service diff --git a/docker/services/nova-consoleauth.yaml b/docker/services/nova-consoleauth.yaml index 1440b2996b..aa1addc150 100644 --- a/docker/services/nova-consoleauth.yaml +++ b/docker/services/nova-consoleauth.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Nova Consoleauth service diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml index 853145fa61..8c6b5c4d50 100644 --- a/docker/services/nova-ironic.yaml +++ b/docker/services/nova-ironic.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Nova Ironic Compute service diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml index b8bbf1fb86..434c634b3f 100644 --- a/docker/services/nova-libvirt.yaml +++ b/docker/services/nova-libvirt.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Libvirt Service diff --git a/docker/services/nova-metadata.yaml b/docker/services/nova-metadata.yaml index 2523f9785f..1178b6bada 100644 --- a/docker/services/nova-metadata.yaml +++ b/docker/services/nova-metadata.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Nova Metadata service diff --git a/docker/services/nova-migration-target.yaml b/docker/services/nova-migration-target.yaml index 82bdbcb48c..2ef91b4351 100644 --- a/docker/services/nova-migration-target.yaml +++ b/docker/services/nova-migration-target.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Nova Migration Target service diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml index 9d74455c89..8bf3fc2b20 100644 --- a/docker/services/nova-placement.yaml +++ b/docker/services/nova-placement.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Nova Placement API service diff --git a/docker/services/nova-scheduler.yaml b/docker/services/nova-scheduler.yaml index 2895e58b40..b47485fa43 100644 --- a/docker/services/nova-scheduler.yaml +++ b/docker/services/nova-scheduler.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Nova Scheduler service diff --git a/docker/services/nova-vnc-proxy.yaml b/docker/services/nova-vnc-proxy.yaml index 7d7c81c760..7d6fa6b693 100644 --- a/docker/services/nova-vnc-proxy.yaml +++ b/docker/services/nova-vnc-proxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Nova Vncproxy service diff --git a/docker/services/novajoin.yaml b/docker/services/novajoin.yaml index 68ccd76110..ce58a63dc8 100644 --- a/docker/services/novajoin.yaml +++ b/docker/services/novajoin.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized novajoin service diff --git a/docker/services/octavia-api.yaml b/docker/services/octavia-api.yaml index 0eb3707b2a..63eb2d6100 100644 --- a/docker/services/octavia-api.yaml +++ b/docker/services/octavia-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Octavia service configured with Puppet diff --git a/docker/services/octavia-health-manager.yaml b/docker/services/octavia-health-manager.yaml index 9f42c24c3e..b74467643d 100644 --- a/docker/services/octavia-health-manager.yaml +++ b/docker/services/octavia-health-manager.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Octavia health-manager service configured with Puppet diff --git a/docker/services/octavia-housekeeping.yaml b/docker/services/octavia-housekeeping.yaml index 99f66baf3d..5b80359ff1 100644 --- a/docker/services/octavia-housekeeping.yaml +++ b/docker/services/octavia-housekeeping.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Octavia service configured with Puppet diff --git a/docker/services/octavia-worker.yaml b/docker/services/octavia-worker.yaml index 87522ec673..e8e827dcfc 100644 --- a/docker/services/octavia-worker.yaml +++ b/docker/services/octavia-worker.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Octavia worker service configured with Puppet diff --git a/docker/services/octavia/octavia-deployment-config.yaml b/docker/services/octavia/octavia-deployment-config.yaml index 1b616cf223..7f19760f9b 100644 --- a/docker/services/octavia/octavia-deployment-config.yaml +++ b/docker/services/octavia/octavia-deployment-config.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: rocky description: > Configuration of Octavia as-a-service resources in the overcloud. diff --git a/docker/services/opendaylight-api.yaml b/docker/services/opendaylight-api.yaml index 64dff1c574..0c2a6b0d4f 100644 --- a/docker/services/opendaylight-api.yaml +++ b/docker/services/opendaylight-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized OpenDaylight API service diff --git a/docker/services/ovn-controller.yaml b/docker/services/ovn-controller.yaml index 293d714c75..c102091946 100644 --- a/docker/services/ovn-controller.yaml +++ b/docker/services/ovn-controller.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Ovn Controller agent. diff --git a/docker/services/ovn-dbs.yaml b/docker/services/ovn-dbs.yaml index d9eacb3dd2..bbd005f9b6 100644 --- a/docker/services/ovn-dbs.yaml +++ b/docker/services/ovn-dbs.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Ovn DBs service diff --git a/docker/services/ovn-metadata.yaml b/docker/services/ovn-metadata.yaml index 89da739278..727a024429 100644 --- a/docker/services/ovn-metadata.yaml +++ b/docker/services/ovn-metadata.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized OVN Metadata agent diff --git a/docker/services/pacemaker/cinder-backup.yaml b/docker/services/pacemaker/cinder-backup.yaml index dba6ec87ed..2593a514ed 100644 --- a/docker/services/pacemaker/cinder-backup.yaml +++ b/docker/services/pacemaker/cinder-backup.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Cinder Backup service diff --git a/docker/services/pacemaker/cinder-volume.yaml b/docker/services/pacemaker/cinder-volume.yaml index 7e515fee34..d02a307e69 100644 --- a/docker/services/pacemaker/cinder-volume.yaml +++ b/docker/services/pacemaker/cinder-volume.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Cinder Volume service diff --git a/docker/services/pacemaker/clustercheck.yaml b/docker/services/pacemaker/clustercheck.yaml index efbfb5c2c1..6019203ac3 100644 --- a/docker/services/pacemaker/clustercheck.yaml +++ b/docker/services/pacemaker/clustercheck.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > MySQL HA clustercheck service deployment using puppet diff --git a/docker/services/pacemaker/database/mysql.yaml b/docker/services/pacemaker/database/mysql.yaml index 76e89ed643..d91f7b2cbb 100644 --- a/docker/services/pacemaker/database/mysql.yaml +++ b/docker/services/pacemaker/database/mysql.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > MySQL service deployment with pacemaker bundle diff --git a/docker/services/pacemaker/database/redis.yaml b/docker/services/pacemaker/database/redis.yaml index 28eed8ebcd..874d506479 100644 --- a/docker/services/pacemaker/database/redis.yaml +++ b/docker/services/pacemaker/database/redis.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Redis services diff --git a/docker/services/pacemaker/haproxy.yaml b/docker/services/pacemaker/haproxy.yaml index 9cdd0859a1..0494c10bc9 100644 --- a/docker/services/pacemaker/haproxy.yaml +++ b/docker/services/pacemaker/haproxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized HAproxy service for pacemaker diff --git a/docker/services/pacemaker/manila-share.yaml b/docker/services/pacemaker/manila-share.yaml index bd50fce5cc..813743d091 100644 --- a/docker/services/pacemaker/manila-share.yaml +++ b/docker/services/pacemaker/manila-share.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Manila Share service diff --git a/docker/services/pacemaker/notify-rabbitmq.yaml b/docker/services/pacemaker/notify-rabbitmq.yaml index 55f1ec5697..62702adc79 100644 --- a/docker/services/pacemaker/notify-rabbitmq.yaml +++ b/docker/services/pacemaker/notify-rabbitmq.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Rabbitmq service diff --git a/docker/services/pacemaker/ovn-dbs.yaml b/docker/services/pacemaker/ovn-dbs.yaml index 7d22e7a001..4dfab0bcb8 100644 --- a/docker/services/pacemaker/ovn-dbs.yaml +++ b/docker/services/pacemaker/ovn-dbs.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized OVN DBs service managed by pacemaker diff --git a/docker/services/pacemaker/rabbitmq.yaml b/docker/services/pacemaker/rabbitmq.yaml index 4d60785732..25c434f359 100644 --- a/docker/services/pacemaker/rabbitmq.yaml +++ b/docker/services/pacemaker/rabbitmq.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Rabbitmq service diff --git a/docker/services/pacemaker/rpc-rabbitmq.yaml b/docker/services/pacemaker/rpc-rabbitmq.yaml index b42c21224e..5b0965fba4 100644 --- a/docker/services/pacemaker/rpc-rabbitmq.yaml +++ b/docker/services/pacemaker/rpc-rabbitmq.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Rabbitmq service diff --git a/docker/services/panko-api.yaml b/docker/services/panko-api.yaml index ebe52a76a8..9ddd255619 100644 --- a/docker/services/panko-api.yaml +++ b/docker/services/panko-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Panko service configured with docker. diff --git a/docker/services/qdrouterd.yaml b/docker/services/qdrouterd.yaml index 34720bf387..d15fa01289 100644 --- a/docker/services/qdrouterd.yaml +++ b/docker/services/qdrouterd.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Qpid dispatch router service diff --git a/docker/services/rabbitmq.yaml b/docker/services/rabbitmq.yaml index 45946e04cb..4e3601e56d 100644 --- a/docker/services/rabbitmq.yaml +++ b/docker/services/rabbitmq.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Rabbitmq service diff --git a/docker/services/rsyslog-sidecar.yaml b/docker/services/rsyslog-sidecar.yaml index 1e19a026a2..29e0876810 100644 --- a/docker/services/rsyslog-sidecar.yaml +++ b/docker/services/rsyslog-sidecar.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Containerized rsyslog-sidecar service diff --git a/docker/services/sahara-api.yaml b/docker/services/sahara-api.yaml index 9d43974f27..3ed1da89b1 100644 --- a/docker/services/sahara-api.yaml +++ b/docker/services/sahara-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Sahara service configured with Puppet diff --git a/docker/services/sahara-engine.yaml b/docker/services/sahara-engine.yaml index a1ca6ac9d9..1336db1746 100644 --- a/docker/services/sahara-engine.yaml +++ b/docker/services/sahara-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Sahara service configured with Puppet diff --git a/docker/services/sensu-client.yaml b/docker/services/sensu-client.yaml index 05f43fdf64..756baabac3 100644 --- a/docker/services/sensu-client.yaml +++ b/docker/services/sensu-client.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Containerized Sensu client service diff --git a/docker/services/skydive/skydive-agent.yaml b/docker/services/skydive/skydive-agent.yaml index de9bbd320f..f83a037b92 100644 --- a/docker/services/skydive/skydive-agent.yaml +++ b/docker/services/skydive/skydive-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Skydive agent service. diff --git a/docker/services/skydive/skydive-analyzer.yaml b/docker/services/skydive/skydive-analyzer.yaml index 4d70020928..5cb7b8a647 100644 --- a/docker/services/skydive/skydive-analyzer.yaml +++ b/docker/services/skydive/skydive-analyzer.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Skydive analyzer service. diff --git a/docker/services/skydive/skydive-base.yaml b/docker/services/skydive/skydive-base.yaml index af8ef99b99..fcef6c6edd 100644 --- a/docker/services/skydive/skydive-base.yaml +++ b/docker/services/skydive/skydive-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Skydive base service. Shared by all Skydive services. diff --git a/docker/services/sshd.yaml b/docker/services/sshd.yaml index 944e7f7b65..bd78ef7659 100644 --- a/docker/services/sshd.yaml +++ b/docker/services/sshd.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Configure sshd_config diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml index 1655406abc..ed71fb2d63 100644 --- a/docker/services/swift-proxy.yaml +++ b/docker/services/swift-proxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized swift proxy service diff --git a/docker/services/swift-ringbuilder.yaml b/docker/services/swift-ringbuilder.yaml index 3968bd51ee..b36eb2eb70 100644 --- a/docker/services/swift-ringbuilder.yaml +++ b/docker/services/swift-ringbuilder.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Swift Ringbuilder diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml index d118088643..e90554d02f 100644 --- a/docker/services/swift-storage.yaml +++ b/docker/services/swift-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Swift Storage services. diff --git a/docker/services/tacker.yaml b/docker/services/tacker.yaml index 3d97b8dd16..c693818ee7 100644 --- a/docker/services/tacker.yaml +++ b/docker/services/tacker.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Tacker service diff --git a/docker/services/tempest.yaml b/docker/services/tempest.yaml index 03d8ac2225..db90cf8c96 100644 --- a/docker/services/tempest.yaml +++ b/docker/services/tempest.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Tempest diff --git a/docker/services/tripleo-ui.yaml b/docker/services/tripleo-ui.yaml index eced1d7cdf..5667b22543 100644 --- a/docker/services/tripleo-ui.yaml +++ b/docker/services/tripleo-ui.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Openstack containerized TripleO UI service diff --git a/docker/services/undercloud-upgrade.yaml b/docker/services/undercloud-upgrade.yaml index 0140b8d5fb..f9bb35f8be 100644 --- a/docker/services/undercloud-upgrade.yaml +++ b/docker/services/undercloud-upgrade.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Upgrade a non-containerized undercloud to a containerized undercloud. diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml index 3f9d6b6335..8633402140 100644 --- a/docker/services/zaqar.yaml +++ b/docker/services/zaqar.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack containerized Zaqar services diff --git a/extraconfig/all_nodes/mac_hostname.j2.yaml b/extraconfig/all_nodes/mac_hostname.j2.yaml index af74f9f448..3776b5d8c0 100644 --- a/extraconfig/all_nodes/mac_hostname.j2.yaml +++ b/extraconfig/all_nodes/mac_hostname.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Example extra config for cluster config diff --git a/extraconfig/all_nodes/random_string.j2.yaml b/extraconfig/all_nodes/random_string.j2.yaml index 911ae15aac..4138fdf43b 100644 --- a/extraconfig/all_nodes/random_string.j2.yaml +++ b/extraconfig/all_nodes/random_string.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Example extra config for cluster config diff --git a/extraconfig/all_nodes/swap-partition.j2.yaml b/extraconfig/all_nodes/swap-partition.j2.yaml index f2b78cdab2..0f3b161e46 100644 --- a/extraconfig/all_nodes/swap-partition.j2.yaml +++ b/extraconfig/all_nodes/swap-partition.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky 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 d6e0ffc750..b70a6a9014 100644 --- a/extraconfig/all_nodes/swap.j2.yaml +++ b/extraconfig/all_nodes/swap.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: Template file to add a swap file to a node. diff --git a/extraconfig/nova_metadata/krb-service-principals.j2.yaml b/extraconfig/nova_metadata/krb-service-principals.j2.yaml index f8be39256f..53bd955f54 100644 --- a/extraconfig/nova_metadata/krb-service-principals.j2.yaml +++ b/extraconfig/nova_metadata/krb-service-principals.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: 'Generates the relevant service principals for a server' parameters: diff --git a/extraconfig/post_deploy/default.yaml b/extraconfig/post_deploy/default.yaml index f79bf7d5e8..e1676d0301 100644 --- a/extraconfig/post_deploy/default.yaml +++ b/extraconfig/post_deploy/default.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: 'Extra Post Deployment Config' parameters: servers: diff --git a/extraconfig/post_deploy/example.yaml b/extraconfig/post_deploy/example.yaml index b3f98839cc..441ec413ab 100644 --- a/extraconfig/post_deploy/example.yaml +++ b/extraconfig/post_deploy/example.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky 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 75956f4136..dd317d2549 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: queens +heat_template_version: rocky 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 e83ff11a5d..31305e8a50 100644 --- a/extraconfig/post_deploy/undercloud_post.yaml +++ b/extraconfig/post_deploy/undercloud_post.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Post-deployment for the TripleO undercloud diff --git a/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml b/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml index 1e32618d8a..845eb7a3e8 100644 --- a/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml +++ b/extraconfig/pre_deploy/rhel-registration/rhel-registration.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > RHEL Registration and unregistration software deployments. diff --git a/extraconfig/pre_network/config_then_reboot.yaml b/extraconfig/pre_network/config_then_reboot.yaml index 224c8db21c..1141434483 100644 --- a/extraconfig/pre_network/config_then_reboot.yaml +++ b/extraconfig/pre_network/config_then_reboot.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Do some configuration, then reboot - sometimes needed for early-boot diff --git a/extraconfig/pre_network/host_config_and_reboot.yaml b/extraconfig/pre_network/host_config_and_reboot.yaml index c2e726773f..f0a418e8f1 100644 --- a/extraconfig/pre_network/host_config_and_reboot.yaml +++ b/extraconfig/pre_network/host_config_and_reboot.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > All configurations which require reboot should be initiated via PreNetworkConfig. After diff --git a/extraconfig/services/ipsec.yaml b/extraconfig/services/ipsec.yaml index 7b05690bd7..608e4d5f02 100644 --- a/extraconfig/services/ipsec.yaml +++ b/extraconfig/services/ipsec.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: Enables IPSEC for the overcloud diff --git a/extraconfig/services/kubernetes-master.yaml b/extraconfig/services/kubernetes-master.yaml index 74d3483837..ab6f4c55aa 100644 --- a/extraconfig/services/kubernetes-master.yaml +++ b/extraconfig/services/kubernetes-master.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: Triggers a Mistral workflow for the deployment of Kubernetes diff --git a/extraconfig/services/kubernetes-worker.yaml b/extraconfig/services/kubernetes-worker.yaml index e8d4ae6d02..2667288c76 100644 --- a/extraconfig/services/kubernetes-worker.yaml +++ b/extraconfig/services/kubernetes-worker.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: Triggers a Mistral workflow for the deployment of Kubernetes diff --git a/extraconfig/services/openshift-cns.yaml b/extraconfig/services/openshift-cns.yaml index 462ddb52cd..70cb0e838d 100644 --- a/extraconfig/services/openshift-cns.yaml +++ b/extraconfig/services/openshift-cns.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: External tasks definition for OpenShift diff --git a/extraconfig/services/openshift-master.yaml b/extraconfig/services/openshift-master.yaml index 7706b5ec9b..7dac2936ec 100644 --- a/extraconfig/services/openshift-master.yaml +++ b/extraconfig/services/openshift-master.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: External tasks definition for OpenShift diff --git a/extraconfig/services/openshift-worker.yaml b/extraconfig/services/openshift-worker.yaml index 7fac2b2f9c..38d12c78b6 100644 --- a/extraconfig/services/openshift-worker.yaml +++ b/extraconfig/services/openshift-worker.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: External tasks definition for OpenShift diff --git a/extraconfig/services/rhsm.yaml b/extraconfig/services/rhsm.yaml index ff9012fd11..ba0c0cd461 100644 --- a/extraconfig/services/rhsm.yaml +++ b/extraconfig/services/rhsm.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: Configure Red Hat Subscription Management. diff --git a/extraconfig/tasks/post_puppet_pacemaker.j2.yaml b/extraconfig/tasks/post_puppet_pacemaker.j2.yaml index dbb3ea305e..396b1c5941 100644 --- a/extraconfig/tasks/post_puppet_pacemaker.j2.yaml +++ b/extraconfig/tasks/post_puppet_pacemaker.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: 'Post-Puppet Config for Pacemaker deployments' parameters: diff --git a/extraconfig/tasks/post_puppet_pacemaker_restart.yaml b/extraconfig/tasks/post_puppet_pacemaker_restart.yaml index dcf8a65161..d8b481ea37 100644 --- a/extraconfig/tasks/post_puppet_pacemaker_restart.yaml +++ b/extraconfig/tasks/post_puppet_pacemaker_restart.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: 'Post-Puppet restart config for Pacemaker deployments' parameters: diff --git a/extraconfig/tasks/pre_puppet_pacemaker.yaml b/extraconfig/tasks/pre_puppet_pacemaker.yaml index 7f9816b18f..1a9a63a007 100644 --- a/extraconfig/tasks/pre_puppet_pacemaker.yaml +++ b/extraconfig/tasks/pre_puppet_pacemaker.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: 'Pre-Puppet Config for Pacemaker deployments' parameters: diff --git a/extraconfig/tasks/ssh/host_public_key.yaml b/extraconfig/tasks/ssh/host_public_key.yaml index 23f0f1c5b7..53ec5528d8 100644 --- a/extraconfig/tasks/ssh/host_public_key.yaml +++ b/extraconfig/tasks/ssh/host_public_key.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > This is a template which will fetch the ssh host public key. diff --git a/extraconfig/tasks/ssh/known_hosts_config.yaml b/extraconfig/tasks/ssh/known_hosts_config.yaml index 2bd80e7b05..c1f6d3f13a 100644 --- a/extraconfig/tasks/ssh/known_hosts_config.yaml +++ b/extraconfig/tasks/ssh/known_hosts_config.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: 'SSH Known Hosts Config' parameters: diff --git a/firstboot/conntectx3_streering.yaml b/firstboot/conntectx3_streering.yaml index db38556511..3466b00baf 100644 --- a/firstboot/conntectx3_streering.yaml +++ b/firstboot/conntectx3_streering.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky 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 397c94e124..4ed4e2b55d 100644 --- a/firstboot/os-net-config-mappings.yaml +++ b/firstboot/os-net-config-mappings.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Configure os-net-config mappings for specific nodes diff --git a/firstboot/userdata_default.yaml b/firstboot/userdata_default.yaml index a2c1d7a7b4..0839cd8c2d 100644 --- a/firstboot/userdata_default.yaml +++ b/firstboot/userdata_default.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky 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 941bb43dce..73ff40e9ee 100644 --- a/firstboot/userdata_dev_rsync.yaml +++ b/firstboot/userdata_dev_rsync.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > This is first boot configuration for development purposes. It allows diff --git a/firstboot/userdata_example.yaml b/firstboot/userdata_example.yaml index 569c313010..85e828dbb6 100644 --- a/firstboot/userdata_example.yaml +++ b/firstboot/userdata_example.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky # 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 6d95b51930..40dabe52df 100644 --- a/firstboot/userdata_heat_admin.yaml +++ b/firstboot/userdata_heat_admin.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky 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 4be0bf0a06..7d7d71103c 100644 --- a/firstboot/userdata_root_password.yaml +++ b/firstboot/userdata_root_password.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Uses cloud-init to enable root logins and set the root password. diff --git a/hosts-config.yaml b/hosts-config.yaml index 7f4d76b064..4501ad72e3 100644 --- a/hosts-config.yaml +++ b/hosts-config.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: 'All Hosts Config' parameters: diff --git a/net-config-bond.j2.yaml b/net-config-bond.j2.yaml index b0a1e71591..474a5f2e3d 100644 --- a/net-config-bond.j2.yaml +++ b/net-config-bond.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive os-net-config with 2 bonded nics on a bridge. parameters: diff --git a/net-config-bridge.j2.yaml b/net-config-bridge.j2.yaml index 21f393442e..3dc892b064 100644 --- a/net-config-bridge.j2.yaml +++ b/net-config-bridge.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive os-net-config for a simple interface on a bridge. parameters: diff --git a/net-config-linux-bridge.j2.yaml b/net-config-linux-bridge.j2.yaml index f7c52c36ab..2f213fac7f 100644 --- a/net-config-linux-bridge.j2.yaml +++ b/net-config-linux-bridge.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive os-net-config for a simple linux bridge. parameters: diff --git a/net-config-noop.j2.yaml b/net-config-noop.j2.yaml index f0e7096d27..eca1387a73 100644 --- a/net-config-noop.j2.yaml +++ b/net-config-noop.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to no-op for os-net-config. Using this will allow you diff --git a/net-config-static-bridge-with-external-dhcp.j2.yaml b/net-config-static-bridge-with-external-dhcp.j2.yaml index 2c31dd3e28..46d708a92b 100644 --- a/net-config-static-bridge-with-external-dhcp.j2.yaml +++ b/net-config-static-bridge-with-external-dhcp.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive os-net-config for a simple bridge configured with external DHCP and a static IP address for the ctlplane network. diff --git a/net-config-static-bridge.j2.yaml b/net-config-static-bridge.j2.yaml index 0ba01788fd..92c759fad4 100644 --- a/net-config-static-bridge.j2.yaml +++ b/net-config-static-bridge.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive os-net-config for a simple bridge configured with a static IP address for the ctlplane network. diff --git a/net-config-static.j2.yaml b/net-config-static.j2.yaml index 052df338f4..284aba215d 100644 --- a/net-config-static.j2.yaml +++ b/net-config-static.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive os-net-config for a simple interface with DHCP. parameters: diff --git a/net-config-undercloud.j2.yaml b/net-config-undercloud.j2.yaml index 26cf617b35..7c2c47f059 100644 --- a/net-config-undercloud.j2.yaml +++ b/net-config-undercloud.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive os-net-config for a simple bridge configured with a static IP address for the ctlplane network. diff --git a/network/config/bond-with-vlans/controller-no-external.j2.yaml b/network/config/bond-with-vlans/controller-no-external.j2.yaml index 51525cc198..f5eb00d1d1 100644 --- a/network/config/bond-with-vlans/controller-no-external.j2.yaml +++ b/network/config/bond-with-vlans/controller-no-external.j2.yaml @@ -2,7 +2,7 @@ # when upgrading a deployment where this template was originally used. For new # deployments, remove the External network from the Controller role and set # default_route_networks to ['ControlPlane']. -heat_template_version: queens +heat_template_version: rocky 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/network/config/bond-with-vlans/controller-v6.j2.yaml b/network/config/bond-with-vlans/controller-v6.j2.yaml index b64d869887..48a0d7652b 100644 --- a/network/config/bond-with-vlans/controller-v6.j2.yaml +++ b/network/config/bond-with-vlans/controller-v6.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive os-net-config with 2 bonded nics on a bridge with VLANs attached for the controller role with IPv6 on the External network. The IPv6 default route is on the External network, and the IPv4 default route is on the Control diff --git a/network/config/bond-with-vlans/role.role.j2.yaml b/network/config/bond-with-vlans/role.role.j2.yaml index 8e7e65a797..2571a9668b 100644 --- a/network/config/bond-with-vlans/role.role.j2.yaml +++ b/network/config/bond-with-vlans/role.role.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive os-net-config with 2 bonded nics on a bridge with VLANs attached for the {{role.name}} role. parameters: diff --git a/network/config/multiple-nics/compute-dvr.j2.yaml b/network/config/multiple-nics/compute-dvr.j2.yaml index 1dce157fe5..1e40ee534b 100644 --- a/network/config/multiple-nics/compute-dvr.j2.yaml +++ b/network/config/multiple-nics/compute-dvr.j2.yaml @@ -1,5 +1,5 @@ # FIXME: This legacy template should be converted to a composable role -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive os-net-config to configure multiple interfaces for the compute role with external bridge for DVR. diff --git a/network/config/multiple-nics/controller-v6.j2.yaml b/network/config/multiple-nics/controller-v6.j2.yaml index 9cb3c20b41..261ed59509 100644 --- a/network/config/multiple-nics/controller-v6.j2.yaml +++ b/network/config/multiple-nics/controller-v6.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive os-net-config to configure multiple interfaces for the controller role with IPv6 on the External network. The IPv6 default route is on the External network, and the IPv4 default route is on the Control Plane. diff --git a/network/config/multiple-nics/role.role.j2.yaml b/network/config/multiple-nics/role.role.j2.yaml index b09820231e..2b4dc2f267 100644 --- a/network/config/multiple-nics/role.role.j2.yaml +++ b/network/config/multiple-nics/role.role.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive os-net-config to configure multiple interfaces for the {{role.name}} role. parameters: diff --git a/network/config/single-nic-linux-bridge-vlans/controller-v6.j2.yaml b/network/config/single-nic-linux-bridge-vlans/controller-v6.j2.yaml index 99de9daa9b..bda9387fba 100644 --- a/network/config/single-nic-linux-bridge-vlans/controller-v6.j2.yaml +++ b/network/config/single-nic-linux-bridge-vlans/controller-v6.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive os-net-config to configure VLANs for the controller role with IPv6 on the External network. The IPv6 default route is on the External network, and the IPv4 default route is on the Control Plane. diff --git a/network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml b/network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml index c9d8e79448..6095aa8a65 100644 --- a/network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml +++ b/network/config/single-nic-linux-bridge-vlans/role.role.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive os-net-config to configure VLANs for the {{role.name}} role. parameters: diff --git a/network/config/single-nic-vlans/controller-no-external.j2.yaml b/network/config/single-nic-vlans/controller-no-external.j2.yaml index 86842f0b0a..600991033e 100644 --- a/network/config/single-nic-vlans/controller-no-external.j2.yaml +++ b/network/config/single-nic-vlans/controller-no-external.j2.yaml @@ -2,7 +2,7 @@ # when upgrading a deployment where this template was originally used. For new # deployments, remove the External network from the Controller role and set # default_route_networks to ['ControlPlane']. -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive os-net-config to configure VLANs for the controller role. No external IP is configured. parameters: diff --git a/network/config/single-nic-vlans/controller-v6.j2.yaml b/network/config/single-nic-vlans/controller-v6.j2.yaml index 15a47d99b2..b8d3b6835d 100644 --- a/network/config/single-nic-vlans/controller-v6.j2.yaml +++ b/network/config/single-nic-vlans/controller-v6.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive os-net-config to configure VLANs for the controller role with IPv6 on the External network. The IPv6 default route is on the External network, and the IPv4 default route is on the Control Plane. diff --git a/network/config/single-nic-vlans/role.role.j2.yaml b/network/config/single-nic-vlans/role.role.j2.yaml index 0abc7ba5a7..f49406d14c 100644 --- a/network/config/single-nic-vlans/role.role.j2.yaml +++ b/network/config/single-nic-vlans/role.role.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to drive os-net-config to configure VLANs for the {{role.name}} role. parameters: diff --git a/network/endpoints/build_endpoint_map.py b/network/endpoints/build_endpoint_map.py index 1f251d81e5..a6483e2376 100755 --- a/network/endpoints/build_endpoint_map.py +++ b/network/endpoints/build_endpoint_map.py @@ -198,7 +198,7 @@ def template_endpoint_items(config): def generate_endpoint_map_template(config): return collections.OrderedDict([ - ('heat_template_version', 'queens'), + ('heat_template_version', 'rocky'), ('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 2c0c8330f8..71d3b51103 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: queens +heat_template_version: rocky 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 04d6c73e61..607c530c71 100644 --- a/network/network.j2 +++ b/network/network.j2 @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > {{network.name}} network definition (automatically generated). diff --git a/network/networks.j2.yaml b/network/networks.j2.yaml index a27d68e423..615f93baaf 100644 --- a/network/networks.j2.yaml +++ b/network/networks.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: Create networks to split out Overcloud traffic diff --git a/network/ports/ctlplane_vip.yaml b/network/ports/ctlplane_vip.yaml index 82709deda8..8290f556ee 100644 --- a/network/ports/ctlplane_vip.yaml +++ b/network/ports/ctlplane_vip.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Creates a port for a VIP on the undercloud ctlplane network. diff --git a/network/ports/from_service.yaml b/network/ports/from_service.yaml index 4fb813e0b6..5f07d061d1 100644 --- a/network/ports/from_service.yaml +++ b/network/ports/from_service.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky 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 eef598a3e9..cc01620c00 100644 --- a/network/ports/from_service_v6.yaml +++ b/network/ports/from_service_v6.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky 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 deb8f2ba4d..d4b1b4f2c8 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: queens +heat_template_version: rocky parameters: ControlPlaneIpList: diff --git a/network/ports/net_ip_map.j2.yaml b/network/ports/net_ip_map.j2.yaml index 805aeed2b6..8046873c1b 100644 --- a/network/ports/net_ip_map.j2.yaml +++ b/network/ports/net_ip_map.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky parameters: ControlPlaneIp: diff --git a/network/ports/net_vip_map_external.j2.yaml b/network/ports/net_vip_map_external.j2.yaml index ca2ed07363..30c176084f 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: queens +heat_template_version: rocky 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 ffad7a1e51..b988e254dc 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: queens +heat_template_version: rocky parameters: # Set these via parameter defaults to configure external VIPs diff --git a/network/ports/noop.yaml b/network/ports/noop.yaml index d31d16255f..8d63101458 100644 --- a/network/ports/noop.yaml +++ b/network/ports/noop.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Returns the control plane port (provisioning network) as the ip_address. diff --git a/network/ports/port.j2 b/network/ports/port.j2 index 1c032897c7..9723daa6e2 100644 --- a/network/ports/port.j2 +++ b/network/ports/port.j2 @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky 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 1786971124..caaa2de331 100644 --- a/network/ports/port_from_pool.j2 +++ b/network/ports/port_from_pool.j2 @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky 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 2cf401ec9b..71e0fe28ae 100644 --- a/network/ports/vip.yaml +++ b/network/ports/vip.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky 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 ae08677678..8c97df530d 100644 --- a/network/ports/vip_v6.yaml +++ b/network/ports/vip_v6.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky 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 1cc174171e..29ed33ef2f 100644 --- a/network/service_net_map.j2.yaml +++ b/network/service_net_map.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Mapping of service_name_network -> network name diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index 61a7401656..788a0e0373 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: queens +heat_template_version: rocky description: > Deploy an OpenStack environment, consisting of several node types (roles), diff --git a/puppet/all-nodes-config.j2.yaml b/puppet/all-nodes-config.j2.yaml index d7e080e651..957cdd4742 100644 --- a/puppet/all-nodes-config.j2.yaml +++ b/puppet/all-nodes-config.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: 'All Nodes Config for Puppet' parameters: diff --git a/puppet/deploy-artifacts.yaml b/puppet/deploy-artifacts.yaml index 85e48f9df9..a44fd7b6d7 100644 --- a/puppet/deploy-artifacts.yaml +++ b/puppet/deploy-artifacts.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Software Config to install deployment artifacts (tarball's and/or diff --git a/puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml b/puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml index 368215a084..75ef7ec6a2 100644 --- a/puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml +++ b/puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: Configure hieradata for all MidoNet nodes diff --git a/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.j2.yaml b/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.j2.yaml index 26a5683a0d..4c60113c35 100644 --- a/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.j2.yaml +++ b/puppet/extraconfig/all_nodes/neutron-ml2-cisco-nexus-ucsm.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: Configure hieradata for Network Cisco configuration diff --git a/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml b/puppet/extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml index 52ea3e31cb..a3e4ebee11 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: queens +heat_template_version: rocky 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 e11bd332b4..c89426b17d 100644 --- a/puppet/extraconfig/pre_deploy/controller/multiple.yaml +++ b/puppet/extraconfig/pre_deploy/controller/multiple.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky 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 640cdea2aa..865fd0dad7 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: queens +heat_template_version: rocky description: Configure hieradata for Neutron Big Switch configuration diff --git a/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml b/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml index 34b49b90c0..67fc3c6c04 100644 --- a/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml +++ b/puppet/extraconfig/pre_deploy/controller/neutron-ml2-cisco-n1kv.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: Configure hieradata for Cisco N1KV configuration diff --git a/puppet/extraconfig/pre_deploy/default.yaml b/puppet/extraconfig/pre_deploy/default.yaml index 474a8307e2..f078abf300 100644 --- a/puppet/extraconfig/pre_deploy/default.yaml +++ b/puppet/extraconfig/pre_deploy/default.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky 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 885e57f325..72dc050fe0 100644 --- a/puppet/extraconfig/pre_deploy/per_node.yaml +++ b/puppet/extraconfig/pre_deploy/per_node.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: Configure hieradata overrides for specific nodes diff --git a/puppet/extraconfig/tls/ca-inject.yaml b/puppet/extraconfig/tls/ca-inject.yaml index f325cf7b0f..a562dc356a 100644 --- a/puppet/extraconfig/tls/ca-inject.yaml +++ b/puppet/extraconfig/tls/ca-inject.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > This is a template which will inject the trusted anchor. diff --git a/puppet/extraconfig/tls/freeipa-enroll.yaml b/puppet/extraconfig/tls/freeipa-enroll.yaml index edde96132f..7ad06538c1 100644 --- a/puppet/extraconfig/tls/freeipa-enroll.yaml +++ b/puppet/extraconfig/tls/freeipa-enroll.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: Enroll nodes to FreeIPA diff --git a/puppet/extraconfig/tls/tls-cert-inject.yaml b/puppet/extraconfig/tls/tls-cert-inject.yaml index 894e83701b..5dcb508a76 100644 --- a/puppet/extraconfig/tls/tls-cert-inject.yaml +++ b/puppet/extraconfig/tls/tls-cert-inject.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > This is a template which will build the TLS Certificates necessary diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index 841f56ec95..8934ab73c1 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: queens +heat_template_version: rocky description: 'OpenStack {{role.name}} node configured by Puppet' parameters: {%- set default_flavor_name = role.FlavorDefault|default('baremetal') %} diff --git a/puppet/services/aide.yaml b/puppet/services/aide.yaml index 7e5dcc2b71..dbd952070c 100644 --- a/puppet/services/aide.yaml +++ b/puppet/services/aide.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Aide service configured with Puppet diff --git a/puppet/services/aodh-api.yaml b/puppet/services/aodh-api.yaml index 6600d6955b..90cdd0d939 100644 --- a/puppet/services/aodh-api.yaml +++ b/puppet/services/aodh-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Aodh API service configured with Puppet diff --git a/puppet/services/aodh-base.yaml b/puppet/services/aodh-base.yaml index 81447ea5d4..2d6d40c625 100644 --- a/puppet/services/aodh-base.yaml +++ b/puppet/services/aodh-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Aodh service configured with Puppet diff --git a/puppet/services/aodh-evaluator.yaml b/puppet/services/aodh-evaluator.yaml index 63a218d256..83442382b1 100644 --- a/puppet/services/aodh-evaluator.yaml +++ b/puppet/services/aodh-evaluator.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Aodh Evaluator service configured with Puppet diff --git a/puppet/services/aodh-listener.yaml b/puppet/services/aodh-listener.yaml index 2c61a13acb..e9e428f06b 100644 --- a/puppet/services/aodh-listener.yaml +++ b/puppet/services/aodh-listener.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Aodh Listener service configured with Puppet diff --git a/puppet/services/aodh-notifier.yaml b/puppet/services/aodh-notifier.yaml index decb014f31..4e824123bd 100644 --- a/puppet/services/aodh-notifier.yaml +++ b/puppet/services/aodh-notifier.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Aodh Notifier service configured with Puppet diff --git a/puppet/services/apache.j2.yaml b/puppet/services/apache.j2.yaml index 91ab0a04e6..41103550db 100644 --- a/puppet/services/apache.j2.yaml +++ b/puppet/services/apache.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Apache service configured with Puppet. Note this is typically included diff --git a/puppet/services/auditd.yaml b/puppet/services/auditd.yaml index 13b2d7d19d..86cbff96ed 100644 --- a/puppet/services/auditd.yaml +++ b/puppet/services/auditd.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > AuditD configured with Puppet diff --git a/puppet/services/barbican-api.yaml b/puppet/services/barbican-api.yaml index a5132a5c58..0cca750ea4 100644 --- a/puppet/services/barbican-api.yaml +++ b/puppet/services/barbican-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Barbican API service configured with Puppet diff --git a/puppet/services/barbican-backend-dogtag.yaml b/puppet/services/barbican-backend-dogtag.yaml index 014c9f8265..c856b897a4 100644 --- a/puppet/services/barbican-backend-dogtag.yaml +++ b/puppet/services/barbican-backend-dogtag.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Barbican API Dogtag backend configured with Puppet diff --git a/puppet/services/barbican-backend-kmip.yaml b/puppet/services/barbican-backend-kmip.yaml index c48ebe4f33..a3cb8c8120 100644 --- a/puppet/services/barbican-backend-kmip.yaml +++ b/puppet/services/barbican-backend-kmip.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Barbican API KMIP backend configured with Puppet diff --git a/puppet/services/barbican-backend-pkcs11-crypto.yaml b/puppet/services/barbican-backend-pkcs11-crypto.yaml index 292d940de6..b0d21e70b5 100644 --- a/puppet/services/barbican-backend-pkcs11-crypto.yaml +++ b/puppet/services/barbican-backend-pkcs11-crypto.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Barbican API PKCS#11 crypto backend configured with Puppet diff --git a/puppet/services/barbican-backend-simple-crypto.yaml b/puppet/services/barbican-backend-simple-crypto.yaml index 4d032c11ea..451c717f83 100644 --- a/puppet/services/barbican-backend-simple-crypto.yaml +++ b/puppet/services/barbican-backend-simple-crypto.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Barbican API simple crypto backend configured with Puppet diff --git a/puppet/services/ca-certs.yaml b/puppet/services/ca-certs.yaml index 9e88f375ac..5413b7b19b 100644 --- a/puppet/services/ca-certs.yaml +++ b/puppet/services/ca-certs.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > HAproxy service configured with Puppet diff --git a/puppet/services/ceilometer-agent-central.yaml b/puppet/services/ceilometer-agent-central.yaml index e1d2dcab56..8c0c4cf22e 100644 --- a/puppet/services/ceilometer-agent-central.yaml +++ b/puppet/services/ceilometer-agent-central.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Ceilometer Central Agent service configured with Puppet diff --git a/puppet/services/ceilometer-agent-compute.yaml b/puppet/services/ceilometer-agent-compute.yaml index c060255db8..617f6f28a6 100644 --- a/puppet/services/ceilometer-agent-compute.yaml +++ b/puppet/services/ceilometer-agent-compute.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Ceilometer Compute Agent service configured with Puppet diff --git a/puppet/services/ceilometer-agent-ipmi.yaml b/puppet/services/ceilometer-agent-ipmi.yaml index ee2a7cea66..ea27de7580 100644 --- a/puppet/services/ceilometer-agent-ipmi.yaml +++ b/puppet/services/ceilometer-agent-ipmi.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Ceilometer Ipmi Agent service configured with Puppet diff --git a/puppet/services/ceilometer-agent-notification.yaml b/puppet/services/ceilometer-agent-notification.yaml index 4a23f10342..ae75cd7893 100644 --- a/puppet/services/ceilometer-agent-notification.yaml +++ b/puppet/services/ceilometer-agent-notification.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Ceilometer Notification Agent service configured with Puppet diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml index 81961e99b1..4b08159738 100644 --- a/puppet/services/ceilometer-base.yaml +++ b/puppet/services/ceilometer-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Ceilometer service configured with Puppet diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml index 4c8d53c9f5..bd72c6496a 100644 --- a/puppet/services/ceph-base.yaml +++ b/puppet/services/ceph-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Ceph base service. Shared by all Ceph services. diff --git a/puppet/services/ceph-client.yaml b/puppet/services/ceph-client.yaml index d5a0ec4d65..4c36dad1d1 100644 --- a/puppet/services/ceph-client.yaml +++ b/puppet/services/ceph-client.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Ceph Client service. diff --git a/puppet/services/ceph-external.yaml b/puppet/services/ceph-external.yaml index c71a4f8938..7373f3b31b 100644 --- a/puppet/services/ceph-external.yaml +++ b/puppet/services/ceph-external.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Ceph External service. diff --git a/puppet/services/ceph-mds.yaml b/puppet/services/ceph-mds.yaml index f48c71118a..1c0487e0ad 100644 --- a/puppet/services/ceph-mds.yaml +++ b/puppet/services/ceph-mds.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Ceph MDS service. diff --git a/puppet/services/ceph-mon.yaml b/puppet/services/ceph-mon.yaml index 3e23a3d7d7..86b469efbc 100644 --- a/puppet/services/ceph-mon.yaml +++ b/puppet/services/ceph-mon.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Ceph Monitor service. diff --git a/puppet/services/ceph-osd.yaml b/puppet/services/ceph-osd.yaml index df64b14d29..3fbae490dd 100644 --- a/puppet/services/ceph-osd.yaml +++ b/puppet/services/ceph-osd.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Ceph OSD service. diff --git a/puppet/services/ceph-rgw.yaml b/puppet/services/ceph-rgw.yaml index 0f0b386814..5a25d57444 100644 --- a/puppet/services/ceph-rgw.yaml +++ b/puppet/services/ceph-rgw.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Ceph RadosGW service. diff --git a/puppet/services/certmonger-user.yaml b/puppet/services/certmonger-user.yaml index 56f4ee9f0c..89bb5a1c71 100644 --- a/puppet/services/certmonger-user.yaml +++ b/puppet/services/certmonger-user.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Requests certificates using certmonger through Puppet diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml index 4614ba2de4..5c31ef6a7f 100644 --- a/puppet/services/cinder-api.yaml +++ b/puppet/services/cinder-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Cinder API service configured with Puppet diff --git a/puppet/services/cinder-backend-dellemc-unity.yaml b/puppet/services/cinder-backend-dellemc-unity.yaml index 4197c2cd3e..668335d10b 100644 --- a/puppet/services/cinder-backend-dellemc-unity.yaml +++ b/puppet/services/cinder-backend-dellemc-unity.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: queens +heat_template_version: rocky description: > Openstack Cinder Dell EMC Unity backend diff --git a/puppet/services/cinder-backend-dellemc-vmax-iscsi.yaml b/puppet/services/cinder-backend-dellemc-vmax-iscsi.yaml index cb13e92586..403a9fd8a2 100644 --- a/puppet/services/cinder-backend-dellemc-vmax-iscsi.yaml +++ b/puppet/services/cinder-backend-dellemc-vmax-iscsi.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: queens +heat_template_version: rocky description: > Openstack Cinder Dell EMC VMAX iscsi backend diff --git a/puppet/services/cinder-backend-dellemc-vnx.yaml b/puppet/services/cinder-backend-dellemc-vnx.yaml index 10e912878b..e4a4e92060 100644 --- a/puppet/services/cinder-backend-dellemc-vnx.yaml +++ b/puppet/services/cinder-backend-dellemc-vnx.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: queens +heat_template_version: rocky description: > Openstack Cinder Dell EMC VNX backend diff --git a/puppet/services/cinder-backend-dellemc-xtremio-iscsi.yaml b/puppet/services/cinder-backend-dellemc-xtremio-iscsi.yaml index 3c574dd6d0..40d67e4847 100644 --- a/puppet/services/cinder-backend-dellemc-xtremio-iscsi.yaml +++ b/puppet/services/cinder-backend-dellemc-xtremio-iscsi.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: queens +heat_template_version: rocky description: > Openstack Cinder Dell EMC XTREMIO Iscsi backend diff --git a/puppet/services/cinder-backend-dellps.yaml b/puppet/services/cinder-backend-dellps.yaml index c6e2b68734..ba9a3e3fc5 100644 --- a/puppet/services/cinder-backend-dellps.yaml +++ b/puppet/services/cinder-backend-dellps.yaml @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -heat_template_version: queens +heat_template_version: rocky description: > Openstack Cinder Dell EMC PS Series backend diff --git a/puppet/services/cinder-backend-dellsc.yaml b/puppet/services/cinder-backend-dellsc.yaml index ac7a6e9ae2..00efcff711 100644 --- a/puppet/services/cinder-backend-dellsc.yaml +++ b/puppet/services/cinder-backend-dellsc.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: queens +heat_template_version: rocky description: > Openstack Cinder Dell EMC Storage Center backend diff --git a/puppet/services/cinder-backend-netapp.yaml b/puppet/services/cinder-backend-netapp.yaml index e8afc6e787..d07ba03643 100644 --- a/puppet/services/cinder-backend-netapp.yaml +++ b/puppet/services/cinder-backend-netapp.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: Openstack Cinder Netapp backend diff --git a/puppet/services/cinder-backend-nvmeof.yaml b/puppet/services/cinder-backend-nvmeof.yaml index d4a12cdc41..9e43bd2b9e 100644 --- a/puppet/services/cinder-backend-nvmeof.yaml +++ b/puppet/services/cinder-backend-nvmeof.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Openstack Cinder NVMeOF backend diff --git a/puppet/services/cinder-backend-pure.yaml b/puppet/services/cinder-backend-pure.yaml index 5b287cf678..e56de1727c 100644 --- a/puppet/services/cinder-backend-pure.yaml +++ b/puppet/services/cinder-backend-pure.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: queens +heat_template_version: rocky description: > Openstack Cinder Pure Storage FlashArray backend diff --git a/puppet/services/cinder-backend-scaleio.yaml b/puppet/services/cinder-backend-scaleio.yaml index e86d4bdc8a..214fd096c3 100644 --- a/puppet/services/cinder-backend-scaleio.yaml +++ b/puppet/services/cinder-backend-scaleio.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: queens +heat_template_version: rocky description: > Openstack Cinder Dell EMC ScaleIO backend diff --git a/puppet/services/cinder-backend-veritas-hyperscale.yaml b/puppet/services/cinder-backend-veritas-hyperscale.yaml index 2d97a40179..185bd0f559 100644 --- a/puppet/services/cinder-backend-veritas-hyperscale.yaml +++ b/puppet/services/cinder-backend-veritas-hyperscale.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: queens +heat_template_version: rocky description: > Openstack Veritas HyperScale backend diff --git a/puppet/services/cinder-backup.yaml b/puppet/services/cinder-backup.yaml index 4a0aa5fe38..37a8185e23 100644 --- a/puppet/services/cinder-backup.yaml +++ b/puppet/services/cinder-backup.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Cinder Backup service configured with Puppet diff --git a/puppet/services/cinder-base.yaml b/puppet/services/cinder-base.yaml index 3f4aaae622..0bac4dde01 100644 --- a/puppet/services/cinder-base.yaml +++ b/puppet/services/cinder-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Cinder base service. Shared by all Cinder services. diff --git a/puppet/services/cinder-hpelefthand-iscsi.yaml b/puppet/services/cinder-hpelefthand-iscsi.yaml index 2b52b5a448..39a7fa6b13 100644 --- a/puppet/services/cinder-hpelefthand-iscsi.yaml +++ b/puppet/services/cinder-hpelefthand-iscsi.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Configure Cinder HPELeftHandISCSIDriver diff --git a/puppet/services/cinder-scheduler.yaml b/puppet/services/cinder-scheduler.yaml index e47b1f71e7..127df28dc3 100644 --- a/puppet/services/cinder-scheduler.yaml +++ b/puppet/services/cinder-scheduler.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Cinder Scheduler service configured with Puppet diff --git a/puppet/services/cinder-volume.yaml b/puppet/services/cinder-volume.yaml index 2ef1b8c70d..c0ab68b507 100644 --- a/puppet/services/cinder-volume.yaml +++ b/puppet/services/cinder-volume.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Cinder Volume service configured with Puppet diff --git a/puppet/services/congress.yaml b/puppet/services/congress.yaml index a15749dbb5..55c43c5906 100644 --- a/puppet/services/congress.yaml +++ b/puppet/services/congress.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Congress service configured with Puppet diff --git a/puppet/services/database/mongodb-base.yaml b/puppet/services/database/mongodb-base.yaml index 28240d6d30..3f2f9cbca6 100644 --- a/puppet/services/database/mongodb-base.yaml +++ b/puppet/services/database/mongodb-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Configuration details for MongoDB service using composable roles diff --git a/puppet/services/database/mongodb.yaml b/puppet/services/database/mongodb.yaml index af0e7f2f44..2ab101ba77 100644 --- a/puppet/services/database/mongodb.yaml +++ b/puppet/services/database/mongodb.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > MongoDb service deployment using puppet diff --git a/puppet/services/database/mysql-client.yaml b/puppet/services/database/mysql-client.yaml index 013f84ba17..d98c8e1b03 100644 --- a/puppet/services/database/mysql-client.yaml +++ b/puppet/services/database/mysql-client.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Mysql client settings diff --git a/puppet/services/database/mysql.yaml b/puppet/services/database/mysql.yaml index 2307e0622a..25b0d341cf 100644 --- a/puppet/services/database/mysql.yaml +++ b/puppet/services/database/mysql.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > MySQL service deployment using puppet diff --git a/puppet/services/database/redis-base.yaml b/puppet/services/database/redis-base.yaml index 94e62df2f8..bdea9dad9b 100644 --- a/puppet/services/database/redis-base.yaml +++ b/puppet/services/database/redis-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Redis service configured with Puppet diff --git a/puppet/services/database/redis.yaml b/puppet/services/database/redis.yaml index 754625f108..e68c1deeff 100644 --- a/puppet/services/database/redis.yaml +++ b/puppet/services/database/redis.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Redis service configured with Puppet diff --git a/puppet/services/designate-api.yaml b/puppet/services/designate-api.yaml index 794c641eb0..8c64af064b 100644 --- a/puppet/services/designate-api.yaml +++ b/puppet/services/designate-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Designate API service. diff --git a/puppet/services/designate-base.yaml b/puppet/services/designate-base.yaml index 3c4169becc..69a22844d7 100644 --- a/puppet/services/designate-base.yaml +++ b/puppet/services/designate-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Designate base service. Shared for all Designate services diff --git a/puppet/services/designate-central.yaml b/puppet/services/designate-central.yaml index 6c8af05774..aaa3efd923 100644 --- a/puppet/services/designate-central.yaml +++ b/puppet/services/designate-central.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Designate Central service configured with Puppet diff --git a/puppet/services/designate-mdns.yaml b/puppet/services/designate-mdns.yaml index c23407afec..bb0a934016 100644 --- a/puppet/services/designate-mdns.yaml +++ b/puppet/services/designate-mdns.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Designate MiniDNS service configured with Puppet diff --git a/puppet/services/designate-producer.yaml b/puppet/services/designate-producer.yaml index b4d557ad9c..f322f20056 100644 --- a/puppet/services/designate-producer.yaml +++ b/puppet/services/designate-producer.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Designate Producer service configured with Puppet diff --git a/puppet/services/designate-sink.yaml b/puppet/services/designate-sink.yaml index 5f342e91fd..8a0e30deb8 100644 --- a/puppet/services/designate-sink.yaml +++ b/puppet/services/designate-sink.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Designate Sink service configured with Puppet diff --git a/puppet/services/designate-worker.yaml b/puppet/services/designate-worker.yaml index 80b52134c2..af085304cb 100644 --- a/puppet/services/designate-worker.yaml +++ b/puppet/services/designate-worker.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Designate Worker service configured with Puppet diff --git a/puppet/services/disabled/ceilometer-api-disabled.yaml b/puppet/services/disabled/ceilometer-api-disabled.yaml index 585036eacd..ba7bd0643f 100644 --- a/puppet/services/disabled/ceilometer-api-disabled.yaml +++ b/puppet/services/disabled/ceilometer-api-disabled.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Ceilometer API service, disabled since pike diff --git a/puppet/services/disabled/ceilometer-collector-disabled.yaml b/puppet/services/disabled/ceilometer-collector-disabled.yaml index c489271c59..e6188481f8 100644 --- a/puppet/services/disabled/ceilometer-collector-disabled.yaml +++ b/puppet/services/disabled/ceilometer-collector-disabled.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Ceilometer Collector service, disabled since pike diff --git a/puppet/services/disabled/ceilometer-expirer-disabled.yaml b/puppet/services/disabled/ceilometer-expirer-disabled.yaml index ae973de037..7ee200c322 100644 --- a/puppet/services/disabled/ceilometer-expirer-disabled.yaml +++ b/puppet/services/disabled/ceilometer-expirer-disabled.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Ceilometer Expirer service, disabled since pike diff --git a/puppet/services/disabled/glance-registry-disabled.yaml b/puppet/services/disabled/glance-registry-disabled.yaml index 237e2c0b8e..44243708ed 100644 --- a/puppet/services/disabled/glance-registry-disabled.yaml +++ b/puppet/services/disabled/glance-registry-disabled.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Glance Registry service, disabled since ocata diff --git a/puppet/services/disabled/heat-api-cloudwatch-disabled.yaml b/puppet/services/disabled/heat-api-cloudwatch-disabled.yaml index 808e7b5890..9cc1a54125 100644 --- a/puppet/services/disabled/heat-api-cloudwatch-disabled.yaml +++ b/puppet/services/disabled/heat-api-cloudwatch-disabled.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Openstack Heat CloudWatch API service, disabled by default since Pike diff --git a/puppet/services/disabled/mongodb-disabled.yaml b/puppet/services/disabled/mongodb-disabled.yaml index 1c95d0e337..eff9f7c1a7 100644 --- a/puppet/services/disabled/mongodb-disabled.yaml +++ b/puppet/services/disabled/mongodb-disabled.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Mongodb service, disabled by default since pike diff --git a/puppet/services/docker-registry.yaml b/puppet/services/docker-registry.yaml index 6368d92b94..c73c86185d 100644 --- a/puppet/services/docker-registry.yaml +++ b/puppet/services/docker-registry.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Configures docker-registry on a host. diff --git a/puppet/services/docker.yaml b/puppet/services/docker.yaml index 361e518c9e..cf55567693 100644 --- a/puppet/services/docker.yaml +++ b/puppet/services/docker.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Configures docker on the host diff --git a/puppet/services/ec2-api.yaml b/puppet/services/ec2-api.yaml index 2e90155794..36ebfa796e 100644 --- a/puppet/services/ec2-api.yaml +++ b/puppet/services/ec2-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack EC2-API service configured with Puppet diff --git a/puppet/services/etcd.yaml b/puppet/services/etcd.yaml index d061faefdd..31c78f258c 100644 --- a/puppet/services/etcd.yaml +++ b/puppet/services/etcd.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Etcd service configured with Puppet diff --git a/puppet/services/external-swift-proxy.yaml b/puppet/services/external-swift-proxy.yaml index e24bd92db6..39b93f91c1 100644 --- a/puppet/services/external-swift-proxy.yaml +++ b/puppet/services/external-swift-proxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > External Swift Proxy endpoint configured with Puppet diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml index 9985f72e54..56d8f6d346 100644 --- a/puppet/services/glance-api.yaml +++ b/puppet/services/glance-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Glance API service configured with Puppet diff --git a/puppet/services/gnocchi-api.yaml b/puppet/services/gnocchi-api.yaml index 157ae5c4d5..a81029d01c 100644 --- a/puppet/services/gnocchi-api.yaml +++ b/puppet/services/gnocchi-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Gnocchi service configured with Puppet diff --git a/puppet/services/gnocchi-base.yaml b/puppet/services/gnocchi-base.yaml index ddd48c7dfa..77cf578179 100644 --- a/puppet/services/gnocchi-base.yaml +++ b/puppet/services/gnocchi-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Gnocchi service configured with Puppet diff --git a/puppet/services/gnocchi-metricd.yaml b/puppet/services/gnocchi-metricd.yaml index 3bbf66191a..4b76459ac5 100644 --- a/puppet/services/gnocchi-metricd.yaml +++ b/puppet/services/gnocchi-metricd.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Gnocchi service configured with Puppet diff --git a/puppet/services/gnocchi-statsd.yaml b/puppet/services/gnocchi-statsd.yaml index 2b22898e67..c2889a4353 100644 --- a/puppet/services/gnocchi-statsd.yaml +++ b/puppet/services/gnocchi-statsd.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Gnocchi service configured with Puppet diff --git a/puppet/services/haproxy-internal-tls-certmonger.j2.yaml b/puppet/services/haproxy-internal-tls-certmonger.j2.yaml index f28da134a2..80edda6246 100644 --- a/puppet/services/haproxy-internal-tls-certmonger.j2.yaml +++ b/puppet/services/haproxy-internal-tls-certmonger.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > HAProxy deployment with TLS enabled, powered by certmonger diff --git a/puppet/services/haproxy-public-tls-certmonger.yaml b/puppet/services/haproxy-public-tls-certmonger.yaml index 40f194ad53..4419972f5b 100644 --- a/puppet/services/haproxy-public-tls-certmonger.yaml +++ b/puppet/services/haproxy-public-tls-certmonger.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > HAProxy deployment with TLS enabled, powered by certmonger diff --git a/puppet/services/haproxy.yaml b/puppet/services/haproxy.yaml index 04a06c9c5a..f5cdcb183a 100644 --- a/puppet/services/haproxy.yaml +++ b/puppet/services/haproxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > HAproxy service configured with Puppet diff --git a/puppet/services/heat-api-cfn.yaml b/puppet/services/heat-api-cfn.yaml index 010548fb54..19b4c3d1f2 100644 --- a/puppet/services/heat-api-cfn.yaml +++ b/puppet/services/heat-api-cfn.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Openstack Heat CloudFormation API service configured with Puppet diff --git a/puppet/services/heat-api.yaml b/puppet/services/heat-api.yaml index 8d69430ed5..8bc4110d05 100644 --- a/puppet/services/heat-api.yaml +++ b/puppet/services/heat-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Openstack Heat API service configured with Puppet diff --git a/puppet/services/heat-base.yaml b/puppet/services/heat-base.yaml index dc6bbffcf5..15b96552c8 100644 --- a/puppet/services/heat-base.yaml +++ b/puppet/services/heat-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Openstack Heat base service. Shared for all Heat services. diff --git a/puppet/services/heat-engine.yaml b/puppet/services/heat-engine.yaml index bb8e2480ac..15e176d820 100644 --- a/puppet/services/heat-engine.yaml +++ b/puppet/services/heat-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Openstack Heat Engine service configured with Puppet diff --git a/puppet/services/horizon.yaml b/puppet/services/horizon.yaml index 97c1c1d47a..d2683b3fdb 100644 --- a/puppet/services/horizon.yaml +++ b/puppet/services/horizon.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Horizon service configured with Puppet diff --git a/puppet/services/ironic-api.yaml b/puppet/services/ironic-api.yaml index d7294be9ed..dded262cd9 100644 --- a/puppet/services/ironic-api.yaml +++ b/puppet/services/ironic-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Ironic API configured with Puppet diff --git a/puppet/services/ironic-base.yaml b/puppet/services/ironic-base.yaml index f2776cb7c1..c975125afc 100644 --- a/puppet/services/ironic-base.yaml +++ b/puppet/services/ironic-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Ironic services configured with Puppet diff --git a/puppet/services/ironic-conductor.yaml b/puppet/services/ironic-conductor.yaml index 94134bc3af..e884dcbbfb 100644 --- a/puppet/services/ironic-conductor.yaml +++ b/puppet/services/ironic-conductor.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Ironic conductor configured with Puppet diff --git a/puppet/services/ironic-inspector.yaml b/puppet/services/ironic-inspector.yaml index c9c35b58da..ef62f39805 100644 --- a/puppet/services/ironic-inspector.yaml +++ b/puppet/services/ironic-inspector.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Ironic Inspector configured with Puppet (EXPERIMENTAL) diff --git a/puppet/services/ironic-neutron-agent.yaml b/puppet/services/ironic-neutron-agent.yaml index 01cf40a0f9..a9a188932a 100644 --- a/puppet/services/ironic-neutron-agent.yaml +++ b/puppet/services/ironic-neutron-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack ironic-neutron-agent configured with Puppet diff --git a/puppet/services/iscsid.yaml b/puppet/services/iscsid.yaml index cc007ee9ed..d7c1954829 100644 --- a/puppet/services/iscsid.yaml +++ b/puppet/services/iscsid.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Configure iscsid diff --git a/puppet/services/keepalived.yaml b/puppet/services/keepalived.yaml index baf57712fe..9d610ba7d9 100644 --- a/puppet/services/keepalived.yaml +++ b/puppet/services/keepalived.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Keepalived service configured with Puppet diff --git a/puppet/services/kernel.yaml b/puppet/services/kernel.yaml index 1810ed4861..c6fa57f7fc 100644 --- a/puppet/services/kernel.yaml +++ b/puppet/services/kernel.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Load kernel modules with kmod and configure kernel options with sysctl. diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml index 26e90ba2ca..a5dd283e81 100644 --- a/puppet/services/keystone.yaml +++ b/puppet/services/keystone.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Keystone service configured with Puppet diff --git a/puppet/services/liquidio-compute-config.yaml b/puppet/services/liquidio-compute-config.yaml index c9ad3724c1..c2b40a4f28 100644 --- a/puppet/services/liquidio-compute-config.yaml +++ b/puppet/services/liquidio-compute-config.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Configures Compute Nodes for liquidio ODL integration diff --git a/puppet/services/logging/fluentd-config.yaml b/puppet/services/logging/fluentd-config.yaml index cebf137e5a..895c33d4f8 100644 --- a/puppet/services/logging/fluentd-config.yaml +++ b/puppet/services/logging/fluentd-config.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: Fluentd logging configuration diff --git a/puppet/services/logging/fluentd.yaml b/puppet/services/logging/fluentd.yaml index 9f00fed386..3aa77c0814 100644 --- a/puppet/services/logging/fluentd.yaml +++ b/puppet/services/logging/fluentd.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: Fluentd client configured with Puppet diff --git a/puppet/services/login-defs.yaml b/puppet/services/login-defs.yaml index 0085f52ee7..a1cfaee7ca 100644 --- a/puppet/services/login-defs.yaml +++ b/puppet/services/login-defs.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Configure login.defs values diff --git a/puppet/services/manila-api.yaml b/puppet/services/manila-api.yaml index c70a634433..338a299de1 100644 --- a/puppet/services/manila-api.yaml +++ b/puppet/services/manila-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Manila-api service configured with Puppet diff --git a/puppet/services/manila-backend-cephfs.yaml b/puppet/services/manila-backend-cephfs.yaml index 1cb724dcf1..b01ed8b675 100644 --- a/puppet/services/manila-backend-cephfs.yaml +++ b/puppet/services/manila-backend-cephfs.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Openstack Manila Cephfs backend diff --git a/puppet/services/manila-backend-isilon.yaml b/puppet/services/manila-backend-isilon.yaml index 882aa1c111..851ef10cd8 100644 --- a/puppet/services/manila-backend-isilon.yaml +++ b/puppet/services/manila-backend-isilon.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Openstack Manila isilon backend. diff --git a/puppet/services/manila-backend-netapp.yaml b/puppet/services/manila-backend-netapp.yaml index f6a906a9ae..9170199344 100644 --- a/puppet/services/manila-backend-netapp.yaml +++ b/puppet/services/manila-backend-netapp.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Openstack Manila netapp backend. diff --git a/puppet/services/manila-backend-unity.yaml b/puppet/services/manila-backend-unity.yaml index 93b0725b6c..5fb27e77fc 100644 --- a/puppet/services/manila-backend-unity.yaml +++ b/puppet/services/manila-backend-unity.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Openstack Manila unity backend. diff --git a/puppet/services/manila-backend-vmax.yaml b/puppet/services/manila-backend-vmax.yaml index e77033dcc9..72e6c0d0f9 100644 --- a/puppet/services/manila-backend-vmax.yaml +++ b/puppet/services/manila-backend-vmax.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Openstack Manila vmax backend. diff --git a/puppet/services/manila-backend-vnx.yaml b/puppet/services/manila-backend-vnx.yaml index 5ee30c47fa..10ae6359d8 100644 --- a/puppet/services/manila-backend-vnx.yaml +++ b/puppet/services/manila-backend-vnx.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Openstack Manila VNX backend. diff --git a/puppet/services/manila-base.yaml b/puppet/services/manila-base.yaml index 295ec422fb..804c5ad26c 100644 --- a/puppet/services/manila-base.yaml +++ b/puppet/services/manila-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Openstack Manila base service. Shared by manila-api/scheduler/share services diff --git a/puppet/services/manila-scheduler.yaml b/puppet/services/manila-scheduler.yaml index 248d9b8e21..63fd7ae4f9 100644 --- a/puppet/services/manila-scheduler.yaml +++ b/puppet/services/manila-scheduler.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Manila-scheduler service configured with Puppet diff --git a/puppet/services/manila-share.yaml b/puppet/services/manila-share.yaml index fb05dacc60..b3875f335d 100644 --- a/puppet/services/manila-share.yaml +++ b/puppet/services/manila-share.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Manila-share service configured with Puppet diff --git a/puppet/services/masquerade-networks.yaml b/puppet/services/masquerade-networks.yaml index 2f748f8ca6..62dd2dc666 100644 --- a/puppet/services/masquerade-networks.yaml +++ b/puppet/services/masquerade-networks.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Configure TripleO Masquerade networks with Puppet. diff --git a/puppet/services/memcached.yaml b/puppet/services/memcached.yaml index 21ac02b4bd..ac77339453 100644 --- a/puppet/services/memcached.yaml +++ b/puppet/services/memcached.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Memcached service configured with Puppet diff --git a/puppet/services/messaging/notify-rabbitmq-shared.yaml b/puppet/services/messaging/notify-rabbitmq-shared.yaml index 52486b9226..05f9e32df2 100644 --- a/puppet/services/messaging/notify-rabbitmq-shared.yaml +++ b/puppet/services/messaging/notify-rabbitmq-shared.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > RabbitMQ service for messaging Notifications configured with Puppet diff --git a/puppet/services/messaging/notify-rabbitmq.yaml b/puppet/services/messaging/notify-rabbitmq.yaml index 6dee3d9071..360b8c8104 100644 --- a/puppet/services/messaging/notify-rabbitmq.yaml +++ b/puppet/services/messaging/notify-rabbitmq.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > RabbitMQ service for messaging Notifications configured with Puppet diff --git a/puppet/services/messaging/rpc-qdrouterd.yaml b/puppet/services/messaging/rpc-qdrouterd.yaml index 93ee568d5b..d0b3332cc3 100644 --- a/puppet/services/messaging/rpc-qdrouterd.yaml +++ b/puppet/services/messaging/rpc-qdrouterd.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Qpid dispatch router service for messaging RPCs configured with Puppet diff --git a/puppet/services/messaging/rpc-rabbitmq.yaml b/puppet/services/messaging/rpc-rabbitmq.yaml index de1009353f..f726db5282 100644 --- a/puppet/services/messaging/rpc-rabbitmq.yaml +++ b/puppet/services/messaging/rpc-rabbitmq.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > RabbitMQ service for messaging RPCs configured with Puppet diff --git a/puppet/services/metrics/collectd.yaml b/puppet/services/metrics/collectd.yaml index ee6b992183..3b1d97d866 100644 --- a/puppet/services/metrics/collectd.yaml +++ b/puppet/services/metrics/collectd.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: Collectd client service diff --git a/puppet/services/mistral-api.yaml b/puppet/services/mistral-api.yaml index 1527e917aa..3e13fd5e65 100644 --- a/puppet/services/mistral-api.yaml +++ b/puppet/services/mistral-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Openstack Mistral API service configured with Puppet diff --git a/puppet/services/mistral-base.yaml b/puppet/services/mistral-base.yaml index 1ee88f06c0..bfe802ff6a 100644 --- a/puppet/services/mistral-base.yaml +++ b/puppet/services/mistral-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Openstack Mistral base service. Shared for all Mistral services. diff --git a/puppet/services/mistral-engine.yaml b/puppet/services/mistral-engine.yaml index ff088c82c7..cc92fc7593 100644 --- a/puppet/services/mistral-engine.yaml +++ b/puppet/services/mistral-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Openstack Mistral Engine service configured with Puppet diff --git a/puppet/services/mistral-event-engine.yaml b/puppet/services/mistral-event-engine.yaml index 31f1531f91..53f4abd3d9 100644 --- a/puppet/services/mistral-event-engine.yaml +++ b/puppet/services/mistral-event-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Openstack Mistral Event Engine service configured with Puppet diff --git a/puppet/services/mistral-executor.yaml b/puppet/services/mistral-executor.yaml index f329b03741..aee3c0d153 100644 --- a/puppet/services/mistral-executor.yaml +++ b/puppet/services/mistral-executor.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Openstack Mistral API service configured with Puppet diff --git a/puppet/services/monitoring/sensu-base.yaml b/puppet/services/monitoring/sensu-base.yaml index 92a4b8a6ab..867967bdc2 100644 --- a/puppet/services/monitoring/sensu-base.yaml +++ b/puppet/services/monitoring/sensu-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: Sensu base service diff --git a/puppet/services/monitoring/sensu-client.yaml b/puppet/services/monitoring/sensu-client.yaml index c571ea5b2f..f83501789c 100644 --- a/puppet/services/monitoring/sensu-client.yaml +++ b/puppet/services/monitoring/sensu-client.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: Sensu client configured with Puppet diff --git a/puppet/services/neutron-api.yaml b/puppet/services/neutron-api.yaml index 3d4fcbe995..95d13c902b 100644 --- a/puppet/services/neutron-api.yaml +++ b/puppet/services/neutron-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron Server configured with Puppet diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml index 94c64075ec..76100f7910 100644 --- a/puppet/services/neutron-base.yaml +++ b/puppet/services/neutron-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron base service. Shared for all Neutron agents. diff --git a/puppet/services/neutron-bgpvpn-api.yaml b/puppet/services/neutron-bgpvpn-api.yaml index d4e5eb685e..ed382e1de8 100644 --- a/puppet/services/neutron-bgpvpn-api.yaml +++ b/puppet/services/neutron-bgpvpn-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > BGPVPN API service configured with Puppet diff --git a/puppet/services/neutron-bgpvpn-bagpipe.yaml b/puppet/services/neutron-bgpvpn-bagpipe.yaml index 44a8a99a88..8c7639602e 100644 --- a/puppet/services/neutron-bgpvpn-bagpipe.yaml +++ b/puppet/services/neutron-bgpvpn-bagpipe.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Bagpipe Driver configured with Puppet diff --git a/puppet/services/neutron-bigswitch-agent.yaml b/puppet/services/neutron-bigswitch-agent.yaml index 92ae41e42a..fb72f72d84 100644 --- a/puppet/services/neutron-bigswitch-agent.yaml +++ b/puppet/services/neutron-bigswitch-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Installs bigswitch agent and enables the services diff --git a/puppet/services/neutron-compute-plugin-midonet.yaml b/puppet/services/neutron-compute-plugin-midonet.yaml index b9389ff6d5..6f8bcb6db9 100644 --- a/puppet/services/neutron-compute-plugin-midonet.yaml +++ b/puppet/services/neutron-compute-plugin-midonet.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron Compute Midonet plugin diff --git a/puppet/services/neutron-compute-plugin-nuage.yaml b/puppet/services/neutron-compute-plugin-nuage.yaml index 98398305ff..d3d2c2f581 100644 --- a/puppet/services/neutron-compute-plugin-nuage.yaml +++ b/puppet/services/neutron-compute-plugin-nuage.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron Compute Nuage plugin diff --git a/puppet/services/neutron-compute-plugin-plumgrid.yaml b/puppet/services/neutron-compute-plugin-plumgrid.yaml index 4ae7e503da..af23c9491e 100644 --- a/puppet/services/neutron-compute-plugin-plumgrid.yaml +++ b/puppet/services/neutron-compute-plugin-plumgrid.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron Compute Plumgrid plugin diff --git a/puppet/services/neutron-dhcp.yaml b/puppet/services/neutron-dhcp.yaml index 7f2e28e015..efea2d8451 100644 --- a/puppet/services/neutron-dhcp.yaml +++ b/puppet/services/neutron-dhcp.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron DHCP agent configured with Puppet diff --git a/puppet/services/neutron-l2gw-agent.yaml b/puppet/services/neutron-l2gw-agent.yaml index d4fbe97979..89b12526c3 100644 --- a/puppet/services/neutron-l2gw-agent.yaml +++ b/puppet/services/neutron-l2gw-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > L2 Gateway agent configured with Puppet diff --git a/puppet/services/neutron-l2gw-api.yaml b/puppet/services/neutron-l2gw-api.yaml index 4d0f827ca2..39c6505ca4 100644 --- a/puppet/services/neutron-l2gw-api.yaml +++ b/puppet/services/neutron-l2gw-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > L2 Gateway service plugin configured with Puppet diff --git a/puppet/services/neutron-l3-compute-dvr.yaml b/puppet/services/neutron-l3-compute-dvr.yaml index 5a4900738f..3c54675327 100644 --- a/puppet/services/neutron-l3-compute-dvr.yaml +++ b/puppet/services/neutron-l3-compute-dvr.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron L3 agent for DVR enabled compute nodes diff --git a/puppet/services/neutron-l3.yaml b/puppet/services/neutron-l3.yaml index ba290c1ad9..71b6022eed 100644 --- a/puppet/services/neutron-l3.yaml +++ b/puppet/services/neutron-l3.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron L3 agent configured with Puppet diff --git a/puppet/services/neutron-lbaas-agent.yaml b/puppet/services/neutron-lbaas-agent.yaml index 963afcc1cb..9c655e8294 100644 --- a/puppet/services/neutron-lbaas-agent.yaml +++ b/puppet/services/neutron-lbaas-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Neutron LBaaS agent configured with Puppet diff --git a/puppet/services/neutron-lbaas-api.yaml b/puppet/services/neutron-lbaas-api.yaml index 34b3eced1f..3b3346dc13 100644 --- a/puppet/services/neutron-lbaas-api.yaml +++ b/puppet/services/neutron-lbaas-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Neutron LBaaS service plugin configured with Puppet diff --git a/puppet/services/neutron-linuxbridge-agent.yaml b/puppet/services/neutron-linuxbridge-agent.yaml index bd18cc70f2..8426727be4 100644 --- a/puppet/services/neutron-linuxbridge-agent.yaml +++ b/puppet/services/neutron-linuxbridge-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron Linuxbridge agent configured with Puppet. diff --git a/puppet/services/neutron-metadata.yaml b/puppet/services/neutron-metadata.yaml index 7f747fd7ed..bd0c56dc13 100644 --- a/puppet/services/neutron-metadata.yaml +++ b/puppet/services/neutron-metadata.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron Metadata agent configured with Puppet diff --git a/puppet/services/neutron-midonet.yaml b/puppet/services/neutron-midonet.yaml index acbb7fb233..79da91ec84 100644 --- a/puppet/services/neutron-midonet.yaml +++ b/puppet/services/neutron-midonet.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron Midonet plugin and services diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml index 52a01079d5..8e51cc04c5 100644 --- a/puppet/services/neutron-ovs-agent.yaml +++ b/puppet/services/neutron-ovs-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron OVS agent configured with Puppet diff --git a/puppet/services/neutron-ovs-dpdk-agent.yaml b/puppet/services/neutron-ovs-dpdk-agent.yaml index eb27c00821..30777f42cd 100644 --- a/puppet/services/neutron-ovs-dpdk-agent.yaml +++ b/puppet/services/neutron-ovs-dpdk-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron OVS DPDK configured with Puppet for Compute Role diff --git a/puppet/services/neutron-plugin-ml2-cisco-vts.yaml b/puppet/services/neutron-plugin-ml2-cisco-vts.yaml index e6e4f7c50b..6d7ad66891 100644 --- a/puppet/services/neutron-plugin-ml2-cisco-vts.yaml +++ b/puppet/services/neutron-plugin-ml2-cisco-vts.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > VTS Controller Settings for the Cisco VTS Neutron ML2 Plugin. diff --git a/puppet/services/neutron-plugin-ml2-fujitsu-cfab.yaml b/puppet/services/neutron-plugin-ml2-fujitsu-cfab.yaml index 00b5610ee9..a283fc624f 100644 --- a/puppet/services/neutron-plugin-ml2-fujitsu-cfab.yaml +++ b/puppet/services/neutron-plugin-ml2-fujitsu-cfab.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Configure hieradata for Fujitsu C-Fabric plugin configuration diff --git a/puppet/services/neutron-plugin-ml2-fujitsu-fossw.yaml b/puppet/services/neutron-plugin-ml2-fujitsu-fossw.yaml index 3c44995cad..d4ba1f5d0b 100644 --- a/puppet/services/neutron-plugin-ml2-fujitsu-fossw.yaml +++ b/puppet/services/neutron-plugin-ml2-fujitsu-fossw.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: Configure hieradata for Fujitsu fossw plugin configuration diff --git a/puppet/services/neutron-plugin-ml2-mlnx-sdn-assist.yaml b/puppet/services/neutron-plugin-ml2-mlnx-sdn-assist.yaml index 6d8de782ca..66f835f7d2 100644 --- a/puppet/services/neutron-plugin-ml2-mlnx-sdn-assist.yaml +++ b/puppet/services/neutron-plugin-ml2-mlnx-sdn-assist.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > MLNX SDN configuration assist for Neutron ML2 Plugin. diff --git a/puppet/services/neutron-plugin-ml2-nuage.yaml b/puppet/services/neutron-plugin-ml2-nuage.yaml index 70edc9883c..eb8678fd05 100644 --- a/puppet/services/neutron-plugin-ml2-nuage.yaml +++ b/puppet/services/neutron-plugin-ml2-nuage.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron ML2/Nuage plugin configured with Puppet diff --git a/puppet/services/neutron-plugin-ml2-odl.yaml b/puppet/services/neutron-plugin-ml2-odl.yaml index cc6e21494c..a3a696ab5a 100644 --- a/puppet/services/neutron-plugin-ml2-odl.yaml +++ b/puppet/services/neutron-plugin-ml2-odl.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron ML2/OpenDaylight plugin configured with Puppet diff --git a/puppet/services/neutron-plugin-ml2-ovn.yaml b/puppet/services/neutron-plugin-ml2-ovn.yaml index a4a67904ed..68a42e96da 100644 --- a/puppet/services/neutron-plugin-ml2-ovn.yaml +++ b/puppet/services/neutron-plugin-ml2-ovn.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron ML2/OVN plugin configured with Puppet diff --git a/puppet/services/neutron-plugin-ml2.yaml b/puppet/services/neutron-plugin-ml2.yaml index 4af3c55b79..2d706fa1e9 100644 --- a/puppet/services/neutron-plugin-ml2.yaml +++ b/puppet/services/neutron-plugin-ml2.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron ML2 Plugin configured with Puppet diff --git a/puppet/services/neutron-plugin-nsx.yaml b/puppet/services/neutron-plugin-nsx.yaml index a68551473f..b96879c943 100644 --- a/puppet/services/neutron-plugin-nsx.yaml +++ b/puppet/services/neutron-plugin-nsx.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron NSX diff --git a/puppet/services/neutron-plugin-nuage.yaml b/puppet/services/neutron-plugin-nuage.yaml index e562acea17..24ea066ffe 100644 --- a/puppet/services/neutron-plugin-nuage.yaml +++ b/puppet/services/neutron-plugin-nuage.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron Nuage plugin diff --git a/puppet/services/neutron-plugin-plumgrid.yaml b/puppet/services/neutron-plugin-plumgrid.yaml index e9c18be077..e8100cb9e2 100644 --- a/puppet/services/neutron-plugin-plumgrid.yaml +++ b/puppet/services/neutron-plugin-plumgrid.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron Plumgrid plugin diff --git a/puppet/services/neutron-sfc-api.yaml b/puppet/services/neutron-sfc-api.yaml index bd62e4d2c5..bb3647ad5c 100644 --- a/puppet/services/neutron-sfc-api.yaml +++ b/puppet/services/neutron-sfc-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > SFC API service configured with Puppet diff --git a/puppet/services/neutron-sriov-agent.yaml b/puppet/services/neutron-sriov-agent.yaml index f5c829389a..5286af2bf1 100644 --- a/puppet/services/neutron-sriov-agent.yaml +++ b/puppet/services/neutron-sriov-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron SR-IOV nic agent configured with Puppet diff --git a/puppet/services/neutron-sriov-host-config.yaml b/puppet/services/neutron-sriov-host-config.yaml index 34855e2ecf..690949f296 100644 --- a/puppet/services/neutron-sriov-host-config.yaml +++ b/puppet/services/neutron-sriov-host-config.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron SR-IOV host configuration diff --git a/puppet/services/neutron-vpp-agent.yaml b/puppet/services/neutron-vpp-agent.yaml index 9e63245648..6dc12a8dc8 100644 --- a/puppet/services/neutron-vpp-agent.yaml +++ b/puppet/services/neutron-vpp-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Neutron ML2/VPP agent configured with Puppet diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml index 04798d5d98..a379fe0fa4 100644 --- a/puppet/services/nova-api.yaml +++ b/puppet/services/nova-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Nova API service configured with Puppet diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml index 52b75a4cba..e7652e6256 100644 --- a/puppet/services/nova-base.yaml +++ b/puppet/services/nova-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Nova base service. Shared for all Nova services. diff --git a/puppet/services/nova-compute.yaml b/puppet/services/nova-compute.yaml index 4bb6749c88..52c688c3e4 100644 --- a/puppet/services/nova-compute.yaml +++ b/puppet/services/nova-compute.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Nova Compute service configured with Puppet diff --git a/puppet/services/nova-conductor.yaml b/puppet/services/nova-conductor.yaml index 53f086b84c..a67cb68de3 100644 --- a/puppet/services/nova-conductor.yaml +++ b/puppet/services/nova-conductor.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Nova Conductor service configured with Puppet diff --git a/puppet/services/nova-consoleauth.yaml b/puppet/services/nova-consoleauth.yaml index 889db8434d..3520bbecc3 100644 --- a/puppet/services/nova-consoleauth.yaml +++ b/puppet/services/nova-consoleauth.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Nova Consoleauth service configured with Puppet diff --git a/puppet/services/nova-ironic.yaml b/puppet/services/nova-ironic.yaml index 79ecf2d8c7..c07e50f128 100644 --- a/puppet/services/nova-ironic.yaml +++ b/puppet/services/nova-ironic.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Nova Compute service configured with Puppet and using Ironic diff --git a/puppet/services/nova-libvirt.yaml b/puppet/services/nova-libvirt.yaml index 12c241a570..c9c11f6533 100644 --- a/puppet/services/nova-libvirt.yaml +++ b/puppet/services/nova-libvirt.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Libvirt service configured with Puppet diff --git a/puppet/services/nova-metadata.yaml b/puppet/services/nova-metadata.yaml index 99a657c6dc..db2c457ebe 100644 --- a/puppet/services/nova-metadata.yaml +++ b/puppet/services/nova-metadata.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Nova API service configured with Puppet diff --git a/puppet/services/nova-migration-target.yaml b/puppet/services/nova-migration-target.yaml index f3f4a26f73..8aa67bf1d6 100644 --- a/puppet/services/nova-migration-target.yaml +++ b/puppet/services/nova-migration-target.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Nova migration target configured with Puppet diff --git a/puppet/services/nova-placement.yaml b/puppet/services/nova-placement.yaml index 67ca00ee70..29a37c5a33 100644 --- a/puppet/services/nova-placement.yaml +++ b/puppet/services/nova-placement.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Nova Placement API service configured with Puppet diff --git a/puppet/services/nova-scheduler.yaml b/puppet/services/nova-scheduler.yaml index b861fc85e1..4148f837b3 100644 --- a/puppet/services/nova-scheduler.yaml +++ b/puppet/services/nova-scheduler.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Nova Scheduler service configured with Puppet diff --git a/puppet/services/nova-vnc-proxy.yaml b/puppet/services/nova-vnc-proxy.yaml index 56d9c1cd1d..c93a375714 100644 --- a/puppet/services/nova-vnc-proxy.yaml +++ b/puppet/services/nova-vnc-proxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Nova Vncproxy service configured with Puppet diff --git a/puppet/services/octavia-api.yaml b/puppet/services/octavia-api.yaml index 3e5e6780ef..e78d31964a 100644 --- a/puppet/services/octavia-api.yaml +++ b/puppet/services/octavia-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Octavia API service. diff --git a/puppet/services/octavia-base.yaml b/puppet/services/octavia-base.yaml index d62e18009b..a5c2775b66 100644 --- a/puppet/services/octavia-base.yaml +++ b/puppet/services/octavia-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Octavia base service. Shared for all Octavia services diff --git a/puppet/services/octavia-health-manager.yaml b/puppet/services/octavia-health-manager.yaml index bc038361c9..658f204819 100644 --- a/puppet/services/octavia-health-manager.yaml +++ b/puppet/services/octavia-health-manager.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Octavia Health Manager service. diff --git a/puppet/services/octavia-housekeeping.yaml b/puppet/services/octavia-housekeeping.yaml index 00aea15971..579c20e1ff 100644 --- a/puppet/services/octavia-housekeeping.yaml +++ b/puppet/services/octavia-housekeeping.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Octavia Housekeeping service. diff --git a/puppet/services/octavia-worker.yaml b/puppet/services/octavia-worker.yaml index 80dc5abd8e..b72af7260a 100644 --- a/puppet/services/octavia-worker.yaml +++ b/puppet/services/octavia-worker.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Octavia Worker service. diff --git a/puppet/services/opendaylight-api.yaml b/puppet/services/opendaylight-api.yaml index edee25175a..b3a78bcfed 100644 --- a/puppet/services/opendaylight-api.yaml +++ b/puppet/services/opendaylight-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenDaylight SDN Controller. diff --git a/puppet/services/opendaylight-ovs.yaml b/puppet/services/opendaylight-ovs.yaml index 4402596ad3..8f9102f9d2 100644 --- a/puppet/services/opendaylight-ovs.yaml +++ b/puppet/services/opendaylight-ovs.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenDaylight OVS Configuration. diff --git a/puppet/services/openvswitch.yaml b/puppet/services/openvswitch.yaml index 710eaede9a..c1ef4c3d5b 100644 --- a/puppet/services/openvswitch.yaml +++ b/puppet/services/openvswitch.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Open vSwitch Configuration diff --git a/puppet/services/ovn-controller.yaml b/puppet/services/ovn-controller.yaml index f400028247..3891ac92b6 100644 --- a/puppet/services/ovn-controller.yaml +++ b/puppet/services/ovn-controller.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack OVN Controller agent diff --git a/puppet/services/ovn-dbs.yaml b/puppet/services/ovn-dbs.yaml index 9bcfcca744..51933f99be 100644 --- a/puppet/services/ovn-dbs.yaml +++ b/puppet/services/ovn-dbs.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OVN databases configured with puppet diff --git a/puppet/services/ovn-metadata.yaml b/puppet/services/ovn-metadata.yaml index 9461df4b30..9e1be0c69f 100644 --- a/puppet/services/ovn-metadata.yaml +++ b/puppet/services/ovn-metadata.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: rocky description: > OpenStack Networking-ovn Metadata agent configured with Puppet diff --git a/puppet/services/pacemaker.yaml b/puppet/services/pacemaker.yaml index 613dd76581..d12af6b12a 100644 --- a/puppet/services/pacemaker.yaml +++ b/puppet/services/pacemaker.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Pacemaker service configured with Puppet diff --git a/puppet/services/pacemaker/ceph-rbdmirror.yaml b/puppet/services/pacemaker/ceph-rbdmirror.yaml index 7b6b898674..06568a28e7 100644 --- a/puppet/services/pacemaker/ceph-rbdmirror.yaml +++ b/puppet/services/pacemaker/ceph-rbdmirror.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Ceph RBD mirror service. diff --git a/puppet/services/pacemaker/cinder-backup.yaml b/puppet/services/pacemaker/cinder-backup.yaml index 513aff35e7..6520f3cbb3 100644 --- a/puppet/services/pacemaker/cinder-backup.yaml +++ b/puppet/services/pacemaker/cinder-backup.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Cinder Backup service with Pacemaker configured with Puppet diff --git a/puppet/services/pacemaker/cinder-volume.yaml b/puppet/services/pacemaker/cinder-volume.yaml index 92320d57e5..6d9296e349 100644 --- a/puppet/services/pacemaker/cinder-volume.yaml +++ b/puppet/services/pacemaker/cinder-volume.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Cinder Volume service with Pacemaker configured with Puppet diff --git a/puppet/services/pacemaker/compute-instanceha.yaml b/puppet/services/pacemaker/compute-instanceha.yaml index cd8c90a4e4..d4b000100e 100644 --- a/puppet/services/pacemaker/compute-instanceha.yaml +++ b/puppet/services/pacemaker/compute-instanceha.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Compute InstanceHA services configured with Puppet diff --git a/puppet/services/pacemaker/database/mysql.yaml b/puppet/services/pacemaker/database/mysql.yaml index 8d124817dd..42c44a80be 100644 --- a/puppet/services/pacemaker/database/mysql.yaml +++ b/puppet/services/pacemaker/database/mysql.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > MySQL with Pacemaker service deployment using puppet diff --git a/puppet/services/pacemaker/database/redis.yaml b/puppet/services/pacemaker/database/redis.yaml index 2298ec2d46..9ac92543e1 100644 --- a/puppet/services/pacemaker/database/redis.yaml +++ b/puppet/services/pacemaker/database/redis.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Redis service configured with Puppet diff --git a/puppet/services/pacemaker/haproxy.yaml b/puppet/services/pacemaker/haproxy.yaml index 2fddca9664..76c154b553 100644 --- a/puppet/services/pacemaker/haproxy.yaml +++ b/puppet/services/pacemaker/haproxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > HAproxy service with Pacemaker configured with Puppet diff --git a/puppet/services/pacemaker/manila-share.yaml b/puppet/services/pacemaker/manila-share.yaml index 0e06f185a6..0958466d03 100644 --- a/puppet/services/pacemaker/manila-share.yaml +++ b/puppet/services/pacemaker/manila-share.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > The manila-share service with Pacemaker configured with Puppet diff --git a/puppet/services/pacemaker/ovn-dbs.yaml b/puppet/services/pacemaker/ovn-dbs.yaml index 71c56a2e95..8a2e6bae18 100644 --- a/puppet/services/pacemaker/ovn-dbs.yaml +++ b/puppet/services/pacemaker/ovn-dbs.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OVN databases configured with puppet in HA mode diff --git a/puppet/services/pacemaker/rabbitmq.yaml b/puppet/services/pacemaker/rabbitmq.yaml index e4b1168f28..54b1babf27 100644 --- a/puppet/services/pacemaker/rabbitmq.yaml +++ b/puppet/services/pacemaker/rabbitmq.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > RabbitMQ service with Pacemaker configured with Puppet diff --git a/puppet/services/pacemaker_remote.yaml b/puppet/services/pacemaker_remote.yaml index f939a3f22f..6113b8f307 100644 --- a/puppet/services/pacemaker_remote.yaml +++ b/puppet/services/pacemaker_remote.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Pacemaker remote service configured with Puppet diff --git a/puppet/services/panko-api.yaml b/puppet/services/panko-api.yaml index f24fac6f46..4e2a267fa2 100644 --- a/puppet/services/panko-api.yaml +++ b/puppet/services/panko-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Panko API service configured with Puppet. diff --git a/puppet/services/panko-base.yaml b/puppet/services/panko-base.yaml index 5584310caf..98c50795c4 100644 --- a/puppet/services/panko-base.yaml +++ b/puppet/services/panko-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Panko service configured with Puppet diff --git a/puppet/services/qdr.yaml b/puppet/services/qdr.yaml index 96a71f6b32..80bb4526e5 100644 --- a/puppet/services/qdr.yaml +++ b/puppet/services/qdr.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Qpid dispatch router service configured with Puppet diff --git a/puppet/services/rabbitmq.yaml b/puppet/services/rabbitmq.yaml index ce8011cf08..db9e2f8b26 100644 --- a/puppet/services/rabbitmq.yaml +++ b/puppet/services/rabbitmq.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > RabbitMQ service configured with Puppet diff --git a/puppet/services/sahara-api.yaml b/puppet/services/sahara-api.yaml index f45a63f668..00fe422e75 100644 --- a/puppet/services/sahara-api.yaml +++ b/puppet/services/sahara-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Sahara API service configured with Puppet diff --git a/puppet/services/sahara-base.yaml b/puppet/services/sahara-base.yaml index 3699263560..cc7191c2a7 100644 --- a/puppet/services/sahara-base.yaml +++ b/puppet/services/sahara-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Sahara base service. Shared for all Sahara services. diff --git a/puppet/services/sahara-engine.yaml b/puppet/services/sahara-engine.yaml index 184aaf7a70..58b3630462 100644 --- a/puppet/services/sahara-engine.yaml +++ b/puppet/services/sahara-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Sahara Engine service configured with Puppet diff --git a/puppet/services/securetty.yaml b/puppet/services/securetty.yaml index 5f833acd31..a24a1d3e9d 100644 --- a/puppet/services/securetty.yaml +++ b/puppet/services/securetty.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Configure securetty values diff --git a/puppet/services/snmp.yaml b/puppet/services/snmp.yaml index 4eac6dd704..f8a8b9829b 100644 --- a/puppet/services/snmp.yaml +++ b/puppet/services/snmp.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > SNMP client configured with Puppet, to facilitate Ceilometer Hardware diff --git a/puppet/services/sshd.yaml b/puppet/services/sshd.yaml index 0b8a73b669..bb8df71246 100644 --- a/puppet/services/sshd.yaml +++ b/puppet/services/sshd.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Configure sshd_config diff --git a/puppet/services/swift-base.yaml b/puppet/services/swift-base.yaml index dba2234839..fe4cb6adc1 100644 --- a/puppet/services/swift-base.yaml +++ b/puppet/services/swift-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Swift Proxy service configured with Puppet diff --git a/puppet/services/swift-dispersion.yaml b/puppet/services/swift-dispersion.yaml index fe5a63f56e..27a083460f 100644 --- a/puppet/services/swift-dispersion.yaml +++ b/puppet/services/swift-dispersion.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Swift dispersion tool configured with Puppet diff --git a/puppet/services/swift-proxy.yaml b/puppet/services/swift-proxy.yaml index 36ef0b2ff4..fc487fe9ab 100644 --- a/puppet/services/swift-proxy.yaml +++ b/puppet/services/swift-proxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Swift Proxy service configured with Puppet diff --git a/puppet/services/swift-ringbuilder.yaml b/puppet/services/swift-ringbuilder.yaml index 21bf0dea6f..5e17c9d219 100644 --- a/puppet/services/swift-ringbuilder.yaml +++ b/puppet/services/swift-ringbuilder.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Swift Ringbuilder diff --git a/puppet/services/swift-storage.yaml b/puppet/services/swift-storage.yaml index dc2f7b6280..f465c8b79e 100644 --- a/puppet/services/swift-storage.yaml +++ b/puppet/services/swift-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Swift Storage service configured with Puppet diff --git a/puppet/services/tacker.yaml b/puppet/services/tacker.yaml index 1a83833df3..2b08e0dfac 100644 --- a/puppet/services/tacker.yaml +++ b/puppet/services/tacker.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack Tacker service configured with Puppet diff --git a/puppet/services/time/ntp.yaml b/puppet/services/time/ntp.yaml index 8a291950ef..504cb989ac 100644 --- a/puppet/services/time/ntp.yaml +++ b/puppet/services/time/ntp.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > NTP service deployment using puppet, this YAML file diff --git a/puppet/services/time/ptp.yaml b/puppet/services/time/ptp.yaml index da32746e45..a4362453ff 100644 --- a/puppet/services/time/ptp.yaml +++ b/puppet/services/time/ptp.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > PTP service deployment using puppet, this YAML file diff --git a/puppet/services/time/timezone.yaml b/puppet/services/time/timezone.yaml index bc939f6933..bab8651190 100644 --- a/puppet/services/time/timezone.yaml +++ b/puppet/services/time/timezone.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Composable Timezone service diff --git a/puppet/services/tripleo-firewall.yaml b/puppet/services/tripleo-firewall.yaml index b92be457ac..176c46691a 100644 --- a/puppet/services/tripleo-firewall.yaml +++ b/puppet/services/tripleo-firewall.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > TripleO Firewall settings diff --git a/puppet/services/tripleo-packages.yaml b/puppet/services/tripleo-packages.yaml index fe28e11892..f817eecc31 100644 --- a/puppet/services/tripleo-packages.yaml +++ b/puppet/services/tripleo-packages.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > TripleO Package installation settings diff --git a/puppet/services/tripleo-ui.yaml b/puppet/services/tripleo-ui.yaml index 091e1470be..d7ec7defb0 100644 --- a/puppet/services/tripleo-ui.yaml +++ b/puppet/services/tripleo-ui.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > OpenStack TripleO UI service configured with Puppet diff --git a/puppet/services/tuned.yaml b/puppet/services/tuned.yaml index 5193bf5c1d..f1903e5eab 100644 --- a/puppet/services/tuned.yaml +++ b/puppet/services/tuned.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Configure tuned diff --git a/puppet/services/veritas-hyperscale-controller.yaml b/puppet/services/veritas-hyperscale-controller.yaml index 7208d59eb0..db10777c44 100644 --- a/puppet/services/veritas-hyperscale-controller.yaml +++ b/puppet/services/veritas-hyperscale-controller.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: queens +heat_template_version: rocky description: > Openstack Veritas HyperScale backend diff --git a/puppet/services/vpp.yaml b/puppet/services/vpp.yaml index baa61f39da..cfd2bbe9d7 100644 --- a/puppet/services/vpp.yaml +++ b/puppet/services/vpp.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Vpp service configured with Puppet diff --git a/puppet/services/zaqar-api.yaml b/puppet/services/zaqar-api.yaml index d5088dadbb..a8e83f9b79 100644 --- a/puppet/services/zaqar-api.yaml +++ b/puppet/services/zaqar-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: queens +heat_template_version: rocky description: > Openstack Zaqar service. Shared for all Heat services. diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index 531ae251ad..6694ae25ae 100755 --- a/tools/yaml-validate.py +++ b/tools/yaml-validate.py @@ -21,13 +21,24 @@ import yaml from copy import copy from sets import Set -# Only permit the template alias versions -# The current template version should be the last element +# Only permit the template alias versions. +# The current template version should be the last element. +# As tripleo-heat-templates is a branched repository, this +# list should contain only the alias name for the current branch. +# This allows to avoid merging old templates versions aliases. valid_heat_template_versions = [ - 'ocata', - 'pike', - 'queens', + 'rocky', ] + +# We should have up-to-date the heat_template_version +# for each template, although there are a few needing +# an specific version, here we can add this exception +# for certain templates. +set_heat_template_versions_in_templates = { + # Needed for mixed version pingtest. + './ci/pingtests/tenantvm_floatingip.yaml' : 'ocata', +} + current_heat_template_version = valid_heat_template_versions[-1] required_params = ['EndpointMap', 'ServiceNetMap', 'DefaultPasswords', @@ -928,7 +939,18 @@ def validate(filename, param_map): # This validation will be applied to all templates not just for those in the services folder. if is_heat_template: tpl_template_version = str(tpl['heat_template_version']) - if tpl_template_version not in valid_heat_template_versions: + + if filename in set_heat_template_versions_in_templates: + if set_heat_template_versions_in_templates[filename] != tpl_template_version: + print('ERROR: heat_template_version in template %s ' + 'must be set to: %s' + % ( + filename, + set_heat_template_versions_in_templates[filename] + ) + ) + return 1 + elif tpl_template_version not in valid_heat_template_versions: print('ERROR: heat_template_version in template %s ' 'is not valid: %s (allowed values %s)' % (