From 927495fe3d964f029f5f0df5fcc9464ce7e6c410 Mon Sep 17 00:00:00 2001 From: Carlos Camacho Date: Mon, 4 Sep 2017 08:31:57 +0200 Subject: [PATCH] Change template names to queens The new master branch should point now to queens instead of pike. So, HOT templates should specify that they might contain features for queens release [1] [1]: https://docs.openstack.org/heat/latest/template_guide/hot_spec.html#queens Change-Id: I7654d1c59db0c4508a9d7045f452612d22493004 --- all-nodes-validation.yaml | 2 +- bootstrap-config.yaml | 2 +- ci/common/all-nodes-validation-disabled.yaml | 2 +- ci/common/net-config-multinode-os-net-config.yaml | 2 +- ci/common/net-config-multinode.yaml | 2 +- ci/environments/multinode-core.yaml | 2 +- .../network/multiple-nics/nic-configs/ceph-storage.yaml | 2 +- .../network/multiple-nics/nic-configs/cinder-storage.yaml | 2 +- .../network/multiple-nics/nic-configs/compute.yaml | 2 +- .../network/multiple-nics/nic-configs/controller.yaml | 2 +- .../network/multiple-nics/nic-configs/swift-storage.yaml | 2 +- ci/pingtests/scenario007-multinode.yaml | 2 +- ci/pingtests/tenantvm_floatingip.yaml | 2 +- common/deploy-steps.j2 | 2 +- common/major_upgrade_steps.j2.yaml | 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/deployed-server-bootstrap-centos.yaml | 2 +- deployed-server/deployed-server-bootstrap-rhel.yaml | 2 +- deployed-server/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 +- docker/services/ceilometer-agent-notification.yaml | 2 +- docker/services/ceph-ansible/ceph-base.yaml | 2 +- docker/services/ceph-ansible/ceph-client.yaml | 2 +- docker/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-osd.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-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/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-pxe.yaml | 2 +- docker/services/iscsid.yaml | 2 +- docker/services/keystone.yaml | 2 +- docker/services/logging/files/barbican-api.yaml | 2 +- docker/services/logging/files/glance-api.yaml | 2 +- docker/services/logging/files/haproxy.yaml | 2 +- docker/services/logging/files/heat-api-cfn.yaml | 2 +- docker/services/logging/files/heat-api.yaml | 2 +- docker/services/logging/files/heat-engine.yaml | 2 +- docker/services/logging/files/keystone.yaml | 2 +- docker/services/logging/files/neutron-api.yaml | 2 +- docker/services/logging/files/neutron-common.yaml | 2 +- docker/services/logging/files/nova-api.yaml | 2 +- docker/services/logging/files/nova-common.yaml | 2 +- docker/services/logging/files/nova-placement.yaml | 2 +- docker/services/logging/files/panko-api.yaml | 2 +- docker/services/logging/stdout/barbican-api.yaml | 2 +- docker/services/logging/stdout/glance-api.yaml | 2 +- docker/services/logging/stdout/haproxy.yaml | 2 +- docker/services/logging/stdout/heat-api-cfn.yaml | 2 +- docker/services/logging/stdout/heat-api.yaml | 2 +- docker/services/logging/stdout/heat-engine.yaml | 2 +- docker/services/logging/stdout/keystone.yaml | 2 +- docker/services/logging/stdout/neutron-common.yaml | 2 +- docker/services/logging/stdout/nova-api.yaml | 2 +- docker/services/logging/stdout/nova-common.yaml | 2 +- docker/services/logging/stdout/nova-libvirt.yaml | 2 +- docker/services/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 +- 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-dhcp.yaml | 2 +- docker/services/neutron-l3.yaml | 2 +- docker/services/neutron-metadata.yaml | 2 +- docker/services/neutron-ovs-agent.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/octavia-api.yaml | 2 +- docker/services/octavia-health-manager.yaml | 2 +- docker/services/octavia-housekeeping.yaml | 2 +- docker/services/octavia-worker.yaml | 2 +- docker/services/opendaylight-api.yaml | 2 +- docker/services/ovn-controller.yaml | 2 +- docker/services/ovn-dbs.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 +- docker/services/pacemaker/ovn-dbs.yaml | 2 +- docker/services/pacemaker/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/zaqar.yaml | 2 +- extraconfig/all_nodes/contrail/enable_contrail_repo.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 +- extraconfig/nova_metadata/krb-service-principals.j2.yaml | 2 +- extraconfig/post_deploy/default.yaml | 2 +- extraconfig/post_deploy/example.yaml | 2 +- extraconfig/post_deploy/example_run_on_update.yaml | 2 +- extraconfig/post_deploy/undercloud_post.yaml | 2 +- .../pre_deploy/rhel-registration/rhel-registration.yaml | 2 +- extraconfig/pre_network/config_then_reboot.yaml | 2 +- extraconfig/pre_network/contrail/compute_pre_network.yaml | 2 +- .../pre_network/contrail/contrail_dpdk_pre_network.yaml | 2 +- extraconfig/pre_network/host_config_and_reboot.role.j2.yaml | 2 +- extraconfig/pre_network/host_config_and_reboot.yaml | 2 +- extraconfig/tasks/post_puppet_pacemaker.j2.yaml | 2 +- extraconfig/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 +- extraconfig/tasks/yum_update.yaml | 2 +- extraconfig/tasks/yum_update_noop.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.yaml | 2 +- net-config-bridge.yaml | 2 +- net-config-linux-bridge.yaml | 2 +- net-config-noop.yaml | 2 +- net-config-static-bridge-with-external-dhcp.yaml | 2 +- net-config-static-bridge.yaml | 2 +- net-config-static.yaml | 2 +- net-config-undercloud.yaml | 2 +- network/config/bond-with-vlans/ceph-storage.yaml | 2 +- network/config/bond-with-vlans/cinder-storage.yaml | 2 +- network/config/bond-with-vlans/compute-dpdk.yaml | 2 +- network/config/bond-with-vlans/compute.yaml | 2 +- network/config/bond-with-vlans/controller-no-external.yaml | 2 +- network/config/bond-with-vlans/controller-v6.yaml | 2 +- network/config/bond-with-vlans/controller.yaml | 2 +- network/config/bond-with-vlans/networker.yaml | 2 +- network/config/bond-with-vlans/swift-storage.yaml | 2 +- network/config/contrail/contrail-nic-config-compute.yaml | 2 +- network/config/contrail/contrail-nic-config.yaml | 2 +- network/config/multiple-nics/ceph-storage.yaml | 2 +- network/config/multiple-nics/cinder-storage.yaml | 2 +- network/config/multiple-nics/compute-dvr.yaml | 2 +- network/config/multiple-nics/compute.yaml | 2 +- network/config/multiple-nics/controller-v6.yaml | 2 +- network/config/multiple-nics/controller.yaml | 2 +- network/config/multiple-nics/networker.yaml | 2 +- network/config/multiple-nics/swift-storage.yaml | 2 +- .../config/single-nic-linux-bridge-vlans/ceph-storage.yaml | 2 +- .../config/single-nic-linux-bridge-vlans/cinder-storage.yaml | 2 +- network/config/single-nic-linux-bridge-vlans/compute.yaml | 2 +- .../config/single-nic-linux-bridge-vlans/controller-v6.yaml | 2 +- network/config/single-nic-linux-bridge-vlans/controller.yaml | 2 +- network/config/single-nic-linux-bridge-vlans/networker.yaml | 2 +- .../config/single-nic-linux-bridge-vlans/swift-storage.yaml | 2 +- network/config/single-nic-vlans/ceph-storage.yaml | 2 +- network/config/single-nic-vlans/cinder-storage.yaml | 2 +- network/config/single-nic-vlans/compute.yaml | 2 +- network/config/single-nic-vlans/controller-no-external.yaml | 2 +- network/config/single-nic-vlans/controller-v6.yaml | 2 +- network/config/single-nic-vlans/controller.yaml | 2 +- network/config/single-nic-vlans/networker.yaml | 2 +- network/config/single-nic-vlans/swift-storage.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/config.role.j2.yaml | 2 +- puppet/deploy-artifacts.yaml | 2 +- puppet/extraconfig/all_nodes/neutron-midonet-all-nodes.yaml | 2 +- .../all_nodes/neutron-ml2-cisco-nexus-ucsm.j2.yaml | 2 +- .../extraconfig/pre_deploy/compute/neutron-ml2-bigswitch.yaml | 2 +- puppet/extraconfig/pre_deploy/controller/multiple.yaml | 2 +- .../pre_deploy/controller/neutron-ml2-bigswitch.yaml | 2 +- .../pre_deploy/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/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.yaml | 2 +- puppet/services/auditd.yaml | 2 +- puppet/services/barbican-api.yaml | 2 +- puppet/services/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 +- puppet/services/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 +- puppet/services/cinder-backend-dellemc-unity.yaml | 2 +- puppet/services/cinder-backend-dellemc-vmax-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-pure.yaml | 2 +- puppet/services/cinder-backend-scaleio.yaml | 2 +- puppet/services/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/disabled/glance-registry-disabled.yaml | 2 +- puppet/services/disabled/heat-api-cloudwatch-disabled.yaml | 2 +- puppet/services/disabled/mongodb-disabled.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 +- puppet/services/haproxy-internal-tls-certmonger.yaml | 2 +- puppet/services/haproxy-public-tls-certmonger.yaml | 2 +- puppet/services/haproxy.yaml | 2 +- puppet/services/heat-api-cfn.yaml | 2 +- puppet/services/heat-api-cloudwatch.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/iscsid.yaml | 2 +- puppet/services/keepalived.yaml | 2 +- puppet/services/kernel.yaml | 2 +- puppet/services/keystone.yaml | 2 +- puppet/services/logging/fluentd-config.yaml | 2 +- puppet/services/logging/fluentd.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/memcached.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/network/contrail-analytics-database.yaml | 2 +- puppet/services/network/contrail-analytics.yaml | 2 +- puppet/services/network/contrail-base.yaml | 2 +- puppet/services/network/contrail-config.yaml | 2 +- puppet/services/network/contrail-control.yaml | 2 +- puppet/services/network/contrail-database.yaml | 2 +- puppet/services/network/contrail-dpdk.yaml | 2 +- puppet/services/network/contrail-heat.yaml | 2 +- puppet/services/network/contrail-neutron-plugin.yaml | 2 +- puppet/services/network/contrail-tsn.yaml | 2 +- puppet/services/network/contrail-vrouter.yaml | 2 +- puppet/services/network/contrail-webui.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 +- puppet/services/neutron-compute-plugin-midonet.yaml | 2 +- puppet/services/neutron-compute-plugin-nuage.yaml | 2 +- puppet/services/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.yaml | 2 +- puppet/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 +- puppet/services/neutron-plugin-ml2-fujitsu-cfab.yaml | 2 +- puppet/services/neutron-plugin-ml2-fujitsu-fossw.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 +- puppet/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/pacemaker.yaml | 2 +- puppet/services/pacemaker/ceph-rbdmirror.yaml | 2 +- puppet/services/pacemaker/cinder-backup.yaml | 2 +- puppet/services/pacemaker/cinder-volume.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/timezone.yaml | 2 +- puppet/services/tripleo-firewall.yaml | 2 +- puppet/services/tripleo-packages.yaml | 2 +- puppet/services/tuned.yaml | 2 +- puppet/services/veritas-hyperscale-controller.yaml | 2 +- puppet/services/vpp.yaml | 2 +- puppet/services/zaqar-api.yaml | 2 +- puppet/upgrade_config.yaml | 2 +- .../update-heat-templates-to-queens-dec638e7b34bed09.yaml | 4 ++++ tools/yaml-validate.py | 2 +- 459 files changed, 462 insertions(+), 458 deletions(-) create mode 100644 releasenotes/notes/update-heat-templates-to-queens-dec638e7b34bed09.yaml diff --git a/all-nodes-validation.yaml b/all-nodes-validation.yaml index 52cd6ac0e5..f736f22662 100644 --- a/all-nodes-validation.yaml +++ b/all-nodes-validation.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive validations that occur on all nodes. diff --git a/bootstrap-config.yaml b/bootstrap-config.yaml index 8e8a2a7a44..548ff7434c 100644 --- a/bootstrap-config.yaml +++ b/bootstrap-config.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: 'Bootstrap Config' parameters: diff --git a/ci/common/all-nodes-validation-disabled.yaml b/ci/common/all-nodes-validation-disabled.yaml index 5b6764200c..004bd11852 100644 --- a/ci/common/all-nodes-validation-disabled.yaml +++ b/ci/common/all-nodes-validation-disabled.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 316862ee4a..7105a14da7 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: pike +heat_template_version: queens 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 6beb62f0c2..02b9507aaf 100644 --- a/ci/common/net-config-multinode.yaml +++ b/ci/common/net-config-multinode.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config for a simple bridge configured diff --git a/ci/environments/multinode-core.yaml b/ci/environments/multinode-core.yaml index 96715bb25f..3e53650455 100644 --- a/ci/environments/multinode-core.yaml +++ b/ci/environments/multinode-core.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Core Service 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 4b2f11a347..efd0300d8c 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: pike +heat_template_version: queens 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 d89c98900f..d74289e26a 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: pike +heat_template_version: queens 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 bf98df2d3a..05b59ec57b 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: pike +heat_template_version: queens 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 184eb04ff4..70c49703ab 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: pike +heat_template_version: queens 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 d89c98900f..d74289e26a 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: pike +heat_template_version: queens parameters: ControlPlaneIp: diff --git a/ci/pingtests/scenario007-multinode.yaml b/ci/pingtests/scenario007-multinode.yaml index b7d6213b7a..9d554321b9 100644 --- a/ci/pingtests/scenario007-multinode.yaml +++ b/ci/pingtests/scenario007-multinode.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > HOT template to created resources deployed by scenario007. diff --git a/ci/pingtests/tenantvm_floatingip.yaml b/ci/pingtests/tenantvm_floatingip.yaml index 28b091156d..92384a6237 100644 --- a/ci/pingtests/tenantvm_floatingip.yaml +++ b/ci/pingtests/tenantvm_floatingip.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > This template resides in tripleo-ci for Mitaka CI jobs only. diff --git a/common/deploy-steps.j2 b/common/deploy-steps.j2 index 20dc9ed238..30d0171444 100644 --- a/common/deploy-steps.j2 +++ b/common/deploy-steps.j2 @@ -21,7 +21,7 @@ {% set update_steps_max = 6 -%} {% set upgrade_steps_max = 6 -%} -heat_template_version: pike +heat_template_version: queens description: > Post-deploy configuration steps via puppet for all roles, diff --git a/common/major_upgrade_steps.j2.yaml b/common/major_upgrade_steps.j2.yaml index 36b342f968..60dd575fba 100644 --- a/common/major_upgrade_steps.j2.yaml +++ b/common/major_upgrade_steps.j2.yaml @@ -2,7 +2,7 @@ {% set batch_upgrade_steps_max = 3 -%} {% set upgrade_steps_max = 6 -%} {% set deliver_script = {'deliver': False} -%} -heat_template_version: pike +heat_template_version: queens description: 'Upgrade steps for all roles' parameters: diff --git a/common/services.yaml b/common/services.yaml index f24ea1679b..73a6582fae 100644 --- a/common/services.yaml +++ b/common/services.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 4422088a06..0db5486f92 100644 --- a/config-download-software.yaml +++ b/config-download-software.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens parameters: diff --git a/config-download-structured.yaml b/config-download-structured.yaml index b699c18a47..f6f73bc6ca 100644 --- a/config-download-structured.yaml +++ b/config-download-structured.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens parameters: diff --git a/default_passwords.yaml b/default_passwords.yaml index 04828d9445..3fddd5ddd9 100644 --- a/default_passwords.yaml +++ b/default_passwords.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: Passwords we manage at the top level diff --git a/deployed-server/ctlplane-port.yaml b/deployed-server/ctlplane-port.yaml index 8cd22ca0ea..99fecd6b64 100644 --- a/deployed-server/ctlplane-port.yaml +++ b/deployed-server/ctlplane-port.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens parameters: network: diff --git a/deployed-server/deployed-neutron-port.yaml b/deployed-server/deployed-neutron-port.yaml index 861ee912cc..e598bcefb6 100644 --- a/deployed-server/deployed-neutron-port.yaml +++ b/deployed-server/deployed-neutron-port.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 d57ea9fc57..8bda4eef00 100644 --- a/deployed-server/deployed-server-bootstrap-centos.yaml +++ b/deployed-server/deployed-server-bootstrap-centos.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: 'Deployed Server Bootstrap Config' diff --git a/deployed-server/deployed-server-bootstrap-rhel.yaml b/deployed-server/deployed-server-bootstrap-rhel.yaml index 554bff3e51..52f8e3fe35 100644 --- a/deployed-server/deployed-server-bootstrap-rhel.yaml +++ b/deployed-server/deployed-server-bootstrap-rhel.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: 'Deployed Server Bootstrap Config' diff --git a/deployed-server/deployed-server-environment-output.yaml b/deployed-server/deployed-server-environment-output.yaml index 89c3886d5f..89460f9971 100644 --- a/deployed-server/deployed-server-environment-output.yaml +++ b/deployed-server/deployed-server-environment-output.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens parameters: RoleCounts: diff --git a/deployed-server/deployed-server.yaml b/deployed-server/deployed-server.yaml index 29216ac849..92c2b0d06c 100644 --- a/deployed-server/deployed-server.yaml +++ b/deployed-server/deployed-server.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens parameters: image: type: string diff --git a/docker/services/aodh-api.yaml b/docker/services/aodh-api.yaml index 9c1b265bf6..6e729bc776 100644 --- a/docker/services/aodh-api.yaml +++ b/docker/services/aodh-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized aodh service diff --git a/docker/services/aodh-evaluator.yaml b/docker/services/aodh-evaluator.yaml index 531987e83d..b693c42fdf 100644 --- a/docker/services/aodh-evaluator.yaml +++ b/docker/services/aodh-evaluator.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Aodh Evaluator service diff --git a/docker/services/aodh-listener.yaml b/docker/services/aodh-listener.yaml index d098c3e843..f8e70c7324 100644 --- a/docker/services/aodh-listener.yaml +++ b/docker/services/aodh-listener.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Aodh Listener service diff --git a/docker/services/aodh-notifier.yaml b/docker/services/aodh-notifier.yaml index c135a4a1f0..6c7711ed33 100644 --- a/docker/services/aodh-notifier.yaml +++ b/docker/services/aodh-notifier.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Aodh Notifier service diff --git a/docker/services/barbican-api.yaml b/docker/services/barbican-api.yaml index dbb4be9018..235d2d2506 100644 --- a/docker/services/barbican-api.yaml +++ b/docker/services/barbican-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Barbican API service diff --git a/docker/services/ceilometer-agent-central.yaml b/docker/services/ceilometer-agent-central.yaml index d4b36b2129..82890e2332 100644 --- a/docker/services/ceilometer-agent-central.yaml +++ b/docker/services/ceilometer-agent-central.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Ceilometer Agent Central service diff --git a/docker/services/ceilometer-agent-compute.yaml b/docker/services/ceilometer-agent-compute.yaml index c665efb4f5..4fe7a011ba 100644 --- a/docker/services/ceilometer-agent-compute.yaml +++ b/docker/services/ceilometer-agent-compute.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Ceilometer Agent Compute service diff --git a/docker/services/ceilometer-agent-ipmi.yaml b/docker/services/ceilometer-agent-ipmi.yaml index d88a3efdd8..1afe42a0eb 100644 --- a/docker/services/ceilometer-agent-ipmi.yaml +++ b/docker/services/ceilometer-agent-ipmi.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Ceilometer Agent Ipmi service diff --git a/docker/services/ceilometer-agent-notification.yaml b/docker/services/ceilometer-agent-notification.yaml index 7859d1f61b..6234274c61 100644 --- a/docker/services/ceilometer-agent-notification.yaml +++ b/docker/services/ceilometer-agent-notification.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 b7b2b40999..97e5294cc8 100644 --- a/docker/services/ceph-ansible/ceph-base.yaml +++ b/docker/services/ceph-ansible/ceph-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 4c1219d336..812e521b2e 100644 --- a/docker/services/ceph-ansible/ceph-client.yaml +++ b/docker/services/ceph-ansible/ceph-client.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Ceph Client service. diff --git a/docker/services/ceph-ansible/ceph-external.yaml b/docker/services/ceph-ansible/ceph-external.yaml index 356296c3fb..9a0eed882e 100644 --- a/docker/services/ceph-ansible/ceph-external.yaml +++ b/docker/services/ceph-ansible/ceph-external.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Ceph External service. diff --git a/docker/services/ceph-ansible/ceph-mds.yaml b/docker/services/ceph-ansible/ceph-mds.yaml index 911e6dd96e..c0ccd9e2fe 100644 --- a/docker/services/ceph-ansible/ceph-mds.yaml +++ b/docker/services/ceph-ansible/ceph-mds.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Ceph Metadata service. diff --git a/docker/services/ceph-ansible/ceph-mgr.yaml b/docker/services/ceph-ansible/ceph-mgr.yaml index 47a34c449d..c357d1cfbe 100644 --- a/docker/services/ceph-ansible/ceph-mgr.yaml +++ b/docker/services/ceph-ansible/ceph-mgr.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Ceph Manager service. diff --git a/docker/services/ceph-ansible/ceph-mon.yaml b/docker/services/ceph-ansible/ceph-mon.yaml index 89eae0a48c..789be62614 100644 --- a/docker/services/ceph-ansible/ceph-mon.yaml +++ b/docker/services/ceph-ansible/ceph-mon.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Ceph Monitor service. diff --git a/docker/services/ceph-ansible/ceph-osd.yaml b/docker/services/ceph-ansible/ceph-osd.yaml index 2a01695625..0fa77c17cd 100644 --- a/docker/services/ceph-ansible/ceph-osd.yaml +++ b/docker/services/ceph-ansible/ceph-osd.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Ceph OSD service. diff --git a/docker/services/ceph-ansible/ceph-rgw.yaml b/docker/services/ceph-ansible/ceph-rgw.yaml index 74bfcdac8e..a2eb06d515 100644 --- a/docker/services/ceph-ansible/ceph-rgw.yaml +++ b/docker/services/ceph-ansible/ceph-rgw.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Ceph RadosGW service. diff --git a/docker/services/cinder-api.yaml b/docker/services/cinder-api.yaml index 9f939a7813..0e995f1f12 100644 --- a/docker/services/cinder-api.yaml +++ b/docker/services/cinder-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Cinder API service diff --git a/docker/services/cinder-backup.yaml b/docker/services/cinder-backup.yaml index 7e05907050..3293b5bc25 100644 --- a/docker/services/cinder-backup.yaml +++ b/docker/services/cinder-backup.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Cinder Backup service diff --git a/docker/services/cinder-scheduler.yaml b/docker/services/cinder-scheduler.yaml index 113abe6c0f..6dc79dd818 100644 --- a/docker/services/cinder-scheduler.yaml +++ b/docker/services/cinder-scheduler.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Cinder Scheduler service diff --git a/docker/services/cinder-volume.yaml b/docker/services/cinder-volume.yaml index 3e136c64a4..c0b13214a3 100644 --- a/docker/services/cinder-volume.yaml +++ b/docker/services/cinder-volume.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Cinder Volume service diff --git a/docker/services/collectd.yaml b/docker/services/collectd.yaml index 0a2efd78d3..0fde1bebbb 100644 --- a/docker/services/collectd.yaml +++ b/docker/services/collectd.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Containerized collectd service diff --git a/docker/services/congress.yaml b/docker/services/congress.yaml index 154252f9ec..982a756865 100644 --- a/docker/services/congress.yaml +++ b/docker/services/congress.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Congress API service diff --git a/docker/services/containers-common.yaml b/docker/services/containers-common.yaml index 2c894da5da..609a6458d5 100644 --- a/docker/services/containers-common.yaml +++ b/docker/services/containers-common.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 bc597eb554..6560e6a766 100644 --- a/docker/services/database/mongodb.yaml +++ b/docker/services/database/mongodb.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > MongoDB service deployment using puppet and docker diff --git a/docker/services/database/mysql.yaml b/docker/services/database/mysql.yaml index 3025eca9cb..53f820e4fe 100644 --- a/docker/services/database/mysql.yaml +++ b/docker/services/database/mysql.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > MySQL service deployment using puppet diff --git a/docker/services/database/redis.yaml b/docker/services/database/redis.yaml index f6167b2e92..51a7e94e23 100644 --- a/docker/services/database/redis.yaml +++ b/docker/services/database/redis.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Redis services diff --git a/docker/services/ec2-api.yaml b/docker/services/ec2-api.yaml index 595cf20b8f..807cb6cfc1 100644 --- a/docker/services/ec2-api.yaml +++ b/docker/services/ec2-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized EC2 API service diff --git a/docker/services/etcd.yaml b/docker/services/etcd.yaml index 2c41bf069c..a3a7150b2a 100644 --- a/docker/services/etcd.yaml +++ b/docker/services/etcd.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized etcd services diff --git a/docker/services/fluentd.yaml b/docker/services/fluentd.yaml index 96cf115aa5..f054a834e8 100644 --- a/docker/services/fluentd.yaml +++ b/docker/services/fluentd.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized fluentd services diff --git a/docker/services/glance-api.yaml b/docker/services/glance-api.yaml index a666ec255e..adb7c29f11 100644 --- a/docker/services/glance-api.yaml +++ b/docker/services/glance-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Glance service configured with Puppet diff --git a/docker/services/gnocchi-api.yaml b/docker/services/gnocchi-api.yaml index 32e4af52d5..4c9f5e906e 100644 --- a/docker/services/gnocchi-api.yaml +++ b/docker/services/gnocchi-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized gnocchi service diff --git a/docker/services/gnocchi-metricd.yaml b/docker/services/gnocchi-metricd.yaml index 404d109405..11fb414c42 100644 --- a/docker/services/gnocchi-metricd.yaml +++ b/docker/services/gnocchi-metricd.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Gnocchi Metricd service diff --git a/docker/services/gnocchi-statsd.yaml b/docker/services/gnocchi-statsd.yaml index 5ad1833167..1df107d053 100644 --- a/docker/services/gnocchi-statsd.yaml +++ b/docker/services/gnocchi-statsd.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Gnocchi Statsd service diff --git a/docker/services/haproxy.yaml b/docker/services/haproxy.yaml index 662cdb81ab..0ac9c69e32 100644 --- a/docker/services/haproxy.yaml +++ b/docker/services/haproxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized HAproxy service diff --git a/docker/services/heat-api-cfn.yaml b/docker/services/heat-api-cfn.yaml index 0457b29da2..d8f666258b 100644 --- a/docker/services/heat-api-cfn.yaml +++ b/docker/services/heat-api-cfn.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Heat API CFN service diff --git a/docker/services/heat-api.yaml b/docker/services/heat-api.yaml index a940315021..a2e5d9d9a1 100644 --- a/docker/services/heat-api.yaml +++ b/docker/services/heat-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Heat API service diff --git a/docker/services/heat-engine.yaml b/docker/services/heat-engine.yaml index f5b6e7c16e..efbfa25d75 100644 --- a/docker/services/heat-engine.yaml +++ b/docker/services/heat-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Heat Engine service diff --git a/docker/services/horizon.yaml b/docker/services/horizon.yaml index c4187e9522..4aa1ff7d47 100644 --- a/docker/services/horizon.yaml +++ b/docker/services/horizon.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Horizon service diff --git a/docker/services/ironic-api.yaml b/docker/services/ironic-api.yaml index 22b035a2bc..fbb4657a52 100644 --- a/docker/services/ironic-api.yaml +++ b/docker/services/ironic-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Ironic API service diff --git a/docker/services/ironic-conductor.yaml b/docker/services/ironic-conductor.yaml index 448fd86fbd..a70d705e25 100644 --- a/docker/services/ironic-conductor.yaml +++ b/docker/services/ironic-conductor.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Ironic Conductor service diff --git a/docker/services/ironic-inspector.yaml b/docker/services/ironic-inspector.yaml index d90b914d7b..6ab0930290 100644 --- a/docker/services/ironic-inspector.yaml +++ b/docker/services/ironic-inspector.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Ironic Inspector service (EXPERIMENTAL) diff --git a/docker/services/ironic-pxe.yaml b/docker/services/ironic-pxe.yaml index c2a3a4609a..2b5f3316b9 100644 --- a/docker/services/ironic-pxe.yaml +++ b/docker/services/ironic-pxe.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Ironic PXE service diff --git a/docker/services/iscsid.yaml b/docker/services/iscsid.yaml index b0d57a2a59..0e20e55155 100644 --- a/docker/services/iscsid.yaml +++ b/docker/services/iscsid.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Iscsid service diff --git a/docker/services/keystone.yaml b/docker/services/keystone.yaml index 0465800add..2b32fc2006 100644 --- a/docker/services/keystone.yaml +++ b/docker/services/keystone.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Keystone service diff --git a/docker/services/logging/files/barbican-api.yaml b/docker/services/logging/files/barbican-api.yaml index 798ca40d79..343f3992b0 100644 --- a/docker/services/logging/files/barbican-api.yaml +++ b/docker/services/logging/files/barbican-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 77481b76ee..ad7e3e9000 100644 --- a/docker/services/logging/files/glance-api.yaml +++ b/docker/services/logging/files/glance-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Glance API service diff --git a/docker/services/logging/files/haproxy.yaml b/docker/services/logging/files/haproxy.yaml index 44e876fd02..46fe420449 100644 --- a/docker/services/logging/files/haproxy.yaml +++ b/docker/services/logging/files/haproxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 33e08c1c25..4fc8a703dc 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: pike +heat_template_version: queens 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 a8f328d6ed..d47b0f6165 100644 --- a/docker/services/logging/files/heat-api.yaml +++ b/docker/services/logging/files/heat-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 70ba25d245..38d02380ab 100644 --- a/docker/services/logging/files/heat-engine.yaml +++ b/docker/services/logging/files/heat-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Glance API service diff --git a/docker/services/logging/files/keystone.yaml b/docker/services/logging/files/keystone.yaml index 6f7f887081..632f938f47 100644 --- a/docker/services/logging/files/keystone.yaml +++ b/docker/services/logging/files/keystone.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Keystone service diff --git a/docker/services/logging/files/neutron-api.yaml b/docker/services/logging/files/neutron-api.yaml index 1ea00664d1..c0d0ab7660 100644 --- a/docker/services/logging/files/neutron-api.yaml +++ b/docker/services/logging/files/neutron-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 8b4607432b..17a70f1af7 100644 --- a/docker/services/logging/files/neutron-common.yaml +++ b/docker/services/logging/files/neutron-common.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Neutron service diff --git a/docker/services/logging/files/nova-api.yaml b/docker/services/logging/files/nova-api.yaml index 67405adf05..86c21df958 100644 --- a/docker/services/logging/files/nova-api.yaml +++ b/docker/services/logging/files/nova-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 5af039c997..2dc19cd1da 100644 --- a/docker/services/logging/files/nova-common.yaml +++ b/docker/services/logging/files/nova-common.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 2551730b53..b8b5805ac6 100644 --- a/docker/services/logging/files/nova-placement.yaml +++ b/docker/services/logging/files/nova-placement.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 83321a715f..996114bd77 100644 --- a/docker/services/logging/files/panko-api.yaml +++ b/docker/services/logging/files/panko-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Panko service diff --git a/docker/services/logging/stdout/barbican-api.yaml b/docker/services/logging/stdout/barbican-api.yaml index c152b358e7..5ec7326aef 100644 --- a/docker/services/logging/stdout/barbican-api.yaml +++ b/docker/services/logging/stdout/barbican-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Barbican service diff --git a/docker/services/logging/stdout/glance-api.yaml b/docker/services/logging/stdout/glance-api.yaml index c06a64fb3a..7ca6415b85 100644 --- a/docker/services/logging/stdout/glance-api.yaml +++ b/docker/services/logging/stdout/glance-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Glance API service diff --git a/docker/services/logging/stdout/haproxy.yaml b/docker/services/logging/stdout/haproxy.yaml index 8c8ef0f0d7..d9ffdf210e 100644 --- a/docker/services/logging/stdout/haproxy.yaml +++ b/docker/services/logging/stdout/haproxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 a5e8c8336f..9fb75f9aa7 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: pike +heat_template_version: queens 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 4d7ffee850..5a0fcc34d7 100644 --- a/docker/services/logging/stdout/heat-api.yaml +++ b/docker/services/logging/stdout/heat-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 c7bc0eb147..e286727ea3 100644 --- a/docker/services/logging/stdout/heat-engine.yaml +++ b/docker/services/logging/stdout/heat-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Glance API service diff --git a/docker/services/logging/stdout/keystone.yaml b/docker/services/logging/stdout/keystone.yaml index f53ddc7c9d..67bec4d25e 100644 --- a/docker/services/logging/stdout/keystone.yaml +++ b/docker/services/logging/stdout/keystone.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Keystone service diff --git a/docker/services/logging/stdout/neutron-common.yaml b/docker/services/logging/stdout/neutron-common.yaml index f3177c44e5..ce26262a5d 100644 --- a/docker/services/logging/stdout/neutron-common.yaml +++ b/docker/services/logging/stdout/neutron-common.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 de38a5f187..90c84cf9e5 100644 --- a/docker/services/logging/stdout/nova-api.yaml +++ b/docker/services/logging/stdout/nova-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 799bbccd70..731856948f 100644 --- a/docker/services/logging/stdout/nova-common.yaml +++ b/docker/services/logging/stdout/nova-common.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 a646c09570..d39b38e542 100644 --- a/docker/services/logging/stdout/nova-libvirt.yaml +++ b/docker/services/logging/stdout/nova-libvirt.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 d39bd6aca7..6113e00608 100644 --- a/docker/services/logging/stdout/nova-placement.yaml +++ b/docker/services/logging/stdout/nova-placement.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 f20590adf2..84e40613b4 100644 --- a/docker/services/logging/stdout/panko-api.yaml +++ b/docker/services/logging/stdout/panko-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Keystone service diff --git a/docker/services/logrotate-crond.yaml b/docker/services/logrotate-crond.yaml index b40cf4a624..1f1f4b13a2 100644 --- a/docker/services/logrotate-crond.yaml +++ b/docker/services/logrotate-crond.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 2c33bf208d..2a18a538de 100644 --- a/docker/services/manila-api.yaml +++ b/docker/services/manila-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Manila API service diff --git a/docker/services/manila-scheduler.yaml b/docker/services/manila-scheduler.yaml index e7c1dfb5d4..06e07fdffc 100644 --- a/docker/services/manila-scheduler.yaml +++ b/docker/services/manila-scheduler.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Manila Scheduler service diff --git a/docker/services/manila-share.yaml b/docker/services/manila-share.yaml index 95440ec914..8a2d3c9f09 100644 --- a/docker/services/manila-share.yaml +++ b/docker/services/manila-share.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Manila Share service diff --git a/docker/services/memcached.yaml b/docker/services/memcached.yaml index 983fca3d39..d05ec30467 100644 --- a/docker/services/memcached.yaml +++ b/docker/services/memcached.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Memcached services diff --git a/docker/services/mistral-api.yaml b/docker/services/mistral-api.yaml index e2d79a7845..34326d404c 100644 --- a/docker/services/mistral-api.yaml +++ b/docker/services/mistral-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Mistral API service diff --git a/docker/services/mistral-engine.yaml b/docker/services/mistral-engine.yaml index 52ecb7df64..350172696b 100644 --- a/docker/services/mistral-engine.yaml +++ b/docker/services/mistral-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Mistral Engine service diff --git a/docker/services/mistral-event-engine.yaml b/docker/services/mistral-event-engine.yaml index 339a7fa0a9..20b1b19239 100644 --- a/docker/services/mistral-event-engine.yaml +++ b/docker/services/mistral-event-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Mistral Event Engine service diff --git a/docker/services/mistral-executor.yaml b/docker/services/mistral-executor.yaml index ac5fe82fc8..075cd55eee 100644 --- a/docker/services/mistral-executor.yaml +++ b/docker/services/mistral-executor.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Mistral Executor service diff --git a/docker/services/multipathd.yaml b/docker/services/multipathd.yaml index 378883fd90..30be7ea968 100644 --- a/docker/services/multipathd.yaml +++ b/docker/services/multipathd.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Multipathd service diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml index 883e6bef1b..fe048cc6d0 100644 --- a/docker/services/neutron-api.yaml +++ b/docker/services/neutron-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Neutron API service diff --git a/docker/services/neutron-dhcp.yaml b/docker/services/neutron-dhcp.yaml index 9a946067db..f29d7ebf28 100644 --- a/docker/services/neutron-dhcp.yaml +++ b/docker/services/neutron-dhcp.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Neutron DHCP service diff --git a/docker/services/neutron-l3.yaml b/docker/services/neutron-l3.yaml index 7b4177829e..48516aee87 100644 --- a/docker/services/neutron-l3.yaml +++ b/docker/services/neutron-l3.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Neutron L3 agent diff --git a/docker/services/neutron-metadata.yaml b/docker/services/neutron-metadata.yaml index e5e7787c75..bbb2932762 100644 --- a/docker/services/neutron-metadata.yaml +++ b/docker/services/neutron-metadata.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Neutron Metadata agent diff --git a/docker/services/neutron-ovs-agent.yaml b/docker/services/neutron-ovs-agent.yaml index 98403119ac..518db30472 100644 --- a/docker/services/neutron-ovs-agent.yaml +++ b/docker/services/neutron-ovs-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Neutron openvswitch service diff --git a/docker/services/neutron-plugin-ml2.yaml b/docker/services/neutron-plugin-ml2.yaml index 5a7488ed40..f3c87eb441 100644 --- a/docker/services/neutron-plugin-ml2.yaml +++ b/docker/services/neutron-plugin-ml2.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 805607b61d..0b06de13f0 100644 --- a/docker/services/neutron-sriov-agent.yaml +++ b/docker/services/neutron-sriov-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Neutron SR-IOV service diff --git a/docker/services/nova-api.yaml b/docker/services/nova-api.yaml index ddfea0415b..835f028e3d 100644 --- a/docker/services/nova-api.yaml +++ b/docker/services/nova-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Nova API service diff --git a/docker/services/nova-compute.yaml b/docker/services/nova-compute.yaml index addc108aff..61db00cec9 100644 --- a/docker/services/nova-compute.yaml +++ b/docker/services/nova-compute.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Nova Compute service diff --git a/docker/services/nova-conductor.yaml b/docker/services/nova-conductor.yaml index 9f1801f976..cf205d7ae5 100644 --- a/docker/services/nova-conductor.yaml +++ b/docker/services/nova-conductor.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Nova Conductor service diff --git a/docker/services/nova-consoleauth.yaml b/docker/services/nova-consoleauth.yaml index e928bea71b..71250b43e3 100644 --- a/docker/services/nova-consoleauth.yaml +++ b/docker/services/nova-consoleauth.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Nova Consoleauth service diff --git a/docker/services/nova-ironic.yaml b/docker/services/nova-ironic.yaml index ac7842ad30..35866cf6ce 100644 --- a/docker/services/nova-ironic.yaml +++ b/docker/services/nova-ironic.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Nova Ironic Compute service diff --git a/docker/services/nova-libvirt.yaml b/docker/services/nova-libvirt.yaml index 04b527dfb2..d366068b22 100644 --- a/docker/services/nova-libvirt.yaml +++ b/docker/services/nova-libvirt.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Libvirt Service diff --git a/docker/services/nova-metadata.yaml b/docker/services/nova-metadata.yaml index ca691e0c49..4bbbbf0f92 100644 --- a/docker/services/nova-metadata.yaml +++ b/docker/services/nova-metadata.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Nova Metadata service diff --git a/docker/services/nova-migration-target.yaml b/docker/services/nova-migration-target.yaml index 35c5e9c376..5d8dd410c2 100644 --- a/docker/services/nova-migration-target.yaml +++ b/docker/services/nova-migration-target.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Nova Migration Target service diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml index 089be1122f..d46a671f52 100644 --- a/docker/services/nova-placement.yaml +++ b/docker/services/nova-placement.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Nova Placement API service diff --git a/docker/services/nova-scheduler.yaml b/docker/services/nova-scheduler.yaml index 7f5a26d3a0..85346dca56 100644 --- a/docker/services/nova-scheduler.yaml +++ b/docker/services/nova-scheduler.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Nova Scheduler service diff --git a/docker/services/nova-vnc-proxy.yaml b/docker/services/nova-vnc-proxy.yaml index de1633556a..a57e35cc9d 100644 --- a/docker/services/nova-vnc-proxy.yaml +++ b/docker/services/nova-vnc-proxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Nova Vncproxy service diff --git a/docker/services/octavia-api.yaml b/docker/services/octavia-api.yaml index 37875fa2cc..8bdadc92ff 100644 --- a/docker/services/octavia-api.yaml +++ b/docker/services/octavia-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Octavia service configured with Puppet diff --git a/docker/services/octavia-health-manager.yaml b/docker/services/octavia-health-manager.yaml index 4cd41e61dc..03627a0789 100644 --- a/docker/services/octavia-health-manager.yaml +++ b/docker/services/octavia-health-manager.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Octavia health-manager service configured with Puppet diff --git a/docker/services/octavia-housekeeping.yaml b/docker/services/octavia-housekeeping.yaml index 4d5451e148..9d0a86b8c1 100644 --- a/docker/services/octavia-housekeeping.yaml +++ b/docker/services/octavia-housekeeping.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Octavia service configured with Puppet diff --git a/docker/services/octavia-worker.yaml b/docker/services/octavia-worker.yaml index 421f8cfed1..37a8211af3 100644 --- a/docker/services/octavia-worker.yaml +++ b/docker/services/octavia-worker.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Octavia worker service configured with Puppet diff --git a/docker/services/opendaylight-api.yaml b/docker/services/opendaylight-api.yaml index f39feca06b..82aa1e15bb 100644 --- a/docker/services/opendaylight-api.yaml +++ b/docker/services/opendaylight-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized OpenDaylight API service diff --git a/docker/services/ovn-controller.yaml b/docker/services/ovn-controller.yaml index aa0771b55a..e418354e52 100644 --- a/docker/services/ovn-controller.yaml +++ b/docker/services/ovn-controller.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Ovn Controller agent. diff --git a/docker/services/ovn-dbs.yaml b/docker/services/ovn-dbs.yaml index 0cc220bf6b..3908305184 100644 --- a/docker/services/ovn-dbs.yaml +++ b/docker/services/ovn-dbs.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Ovn DBs service diff --git a/docker/services/pacemaker/cinder-backup.yaml b/docker/services/pacemaker/cinder-backup.yaml index 427c404539..5e50427b28 100644 --- a/docker/services/pacemaker/cinder-backup.yaml +++ b/docker/services/pacemaker/cinder-backup.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Cinder Backup service diff --git a/docker/services/pacemaker/cinder-volume.yaml b/docker/services/pacemaker/cinder-volume.yaml index d6cd696c50..075f956b23 100644 --- a/docker/services/pacemaker/cinder-volume.yaml +++ b/docker/services/pacemaker/cinder-volume.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Cinder Volume service diff --git a/docker/services/pacemaker/clustercheck.yaml b/docker/services/pacemaker/clustercheck.yaml index ea3cf5e0a5..efbfb5c2c1 100644 --- a/docker/services/pacemaker/clustercheck.yaml +++ b/docker/services/pacemaker/clustercheck.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 9a39747502..956782e9a8 100644 --- a/docker/services/pacemaker/database/mysql.yaml +++ b/docker/services/pacemaker/database/mysql.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > MySQL service deployment with pacemaker bundle diff --git a/docker/services/pacemaker/database/redis.yaml b/docker/services/pacemaker/database/redis.yaml index a735b89de2..26e76de06c 100644 --- a/docker/services/pacemaker/database/redis.yaml +++ b/docker/services/pacemaker/database/redis.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Redis services diff --git a/docker/services/pacemaker/haproxy.yaml b/docker/services/pacemaker/haproxy.yaml index a549199e70..eb350ff928 100644 --- a/docker/services/pacemaker/haproxy.yaml +++ b/docker/services/pacemaker/haproxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized HAproxy service for pacemaker diff --git a/docker/services/pacemaker/manila-share.yaml b/docker/services/pacemaker/manila-share.yaml index 0845c1b669..7140ef9217 100644 --- a/docker/services/pacemaker/manila-share.yaml +++ b/docker/services/pacemaker/manila-share.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Manila Share service diff --git a/docker/services/pacemaker/ovn-dbs.yaml b/docker/services/pacemaker/ovn-dbs.yaml index e8b73e8aef..87066eb3e8 100644 --- a/docker/services/pacemaker/ovn-dbs.yaml +++ b/docker/services/pacemaker/ovn-dbs.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized OVN DBs service managed by pacemaker diff --git a/docker/services/pacemaker/rabbitmq.yaml b/docker/services/pacemaker/rabbitmq.yaml index a8bb3ef157..ebdd25fef5 100644 --- a/docker/services/pacemaker/rabbitmq.yaml +++ b/docker/services/pacemaker/rabbitmq.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Rabbitmq service diff --git a/docker/services/panko-api.yaml b/docker/services/panko-api.yaml index 5daa8dde54..93dc2597a7 100644 --- a/docker/services/panko-api.yaml +++ b/docker/services/panko-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Panko service configured with docker. diff --git a/docker/services/qdrouterd.yaml b/docker/services/qdrouterd.yaml index 990cd95bbf..34720bf387 100644 --- a/docker/services/qdrouterd.yaml +++ b/docker/services/qdrouterd.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Qpid dispatch router service diff --git a/docker/services/rabbitmq.yaml b/docker/services/rabbitmq.yaml index 90d6cb11e9..36e1c8f4df 100644 --- a/docker/services/rabbitmq.yaml +++ b/docker/services/rabbitmq.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Rabbitmq service diff --git a/docker/services/rsyslog-sidecar.yaml b/docker/services/rsyslog-sidecar.yaml index 708757fe51..1e19a026a2 100644 --- a/docker/services/rsyslog-sidecar.yaml +++ b/docker/services/rsyslog-sidecar.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Containerized rsyslog-sidecar service diff --git a/docker/services/sahara-api.yaml b/docker/services/sahara-api.yaml index 2b1384fb96..762053e15e 100644 --- a/docker/services/sahara-api.yaml +++ b/docker/services/sahara-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Sahara service configured with Puppet diff --git a/docker/services/sahara-engine.yaml b/docker/services/sahara-engine.yaml index 98c220fc81..3ec2dd469f 100644 --- a/docker/services/sahara-engine.yaml +++ b/docker/services/sahara-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Sahara service configured with Puppet diff --git a/docker/services/sensu-client.yaml b/docker/services/sensu-client.yaml index d8176f41e4..6db183afe6 100644 --- a/docker/services/sensu-client.yaml +++ b/docker/services/sensu-client.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Containerized Sensu client service diff --git a/docker/services/skydive/skydive-agent.yaml b/docker/services/skydive/skydive-agent.yaml index 5ffacdf53f..2aefe5d884 100644 --- a/docker/services/skydive/skydive-agent.yaml +++ b/docker/services/skydive/skydive-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Skydive agent service. diff --git a/docker/services/skydive/skydive-analyzer.yaml b/docker/services/skydive/skydive-analyzer.yaml index d57837bbc0..0f39c52814 100644 --- a/docker/services/skydive/skydive-analyzer.yaml +++ b/docker/services/skydive/skydive-analyzer.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Skydive analyzer service. diff --git a/docker/services/skydive/skydive-base.yaml b/docker/services/skydive/skydive-base.yaml index 57324f1281..6823c835c8 100644 --- a/docker/services/skydive/skydive-base.yaml +++ b/docker/services/skydive/skydive-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Skydive base service. Shared by all Skydive services. diff --git a/docker/services/sshd.yaml b/docker/services/sshd.yaml index 6f57f13d40..944e7f7b65 100644 --- a/docker/services/sshd.yaml +++ b/docker/services/sshd.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Configure sshd_config diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml index d8f5fb276b..477da55630 100644 --- a/docker/services/swift-proxy.yaml +++ b/docker/services/swift-proxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized swift proxy service diff --git a/docker/services/swift-ringbuilder.yaml b/docker/services/swift-ringbuilder.yaml index fda55120bd..3968bd51ee 100644 --- a/docker/services/swift-ringbuilder.yaml +++ b/docker/services/swift-ringbuilder.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Swift Ringbuilder diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml index e74d86fbd1..ebfbea5413 100644 --- a/docker/services/swift-storage.yaml +++ b/docker/services/swift-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Swift Storage services. diff --git a/docker/services/tacker.yaml b/docker/services/tacker.yaml index 2359e9645d..cd335a7de7 100644 --- a/docker/services/tacker.yaml +++ b/docker/services/tacker.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Tacker service diff --git a/docker/services/zaqar.yaml b/docker/services/zaqar.yaml index 742a658134..09ffcfb1ad 100644 --- a/docker/services/zaqar.yaml +++ b/docker/services/zaqar.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack containerized Zaqar services diff --git a/extraconfig/all_nodes/contrail/enable_contrail_repo.yaml b/extraconfig/all_nodes/contrail/enable_contrail_repo.yaml index 51da6f6536..739e3c692e 100644 --- a/extraconfig/all_nodes/contrail/enable_contrail_repo.yaml +++ b/extraconfig/all_nodes/contrail/enable_contrail_repo.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens parameters: ContrailRepo: diff --git a/extraconfig/all_nodes/mac_hostname.j2.yaml b/extraconfig/all_nodes/mac_hostname.j2.yaml index 79794f9f43..af74f9f448 100644 --- a/extraconfig/all_nodes/mac_hostname.j2.yaml +++ b/extraconfig/all_nodes/mac_hostname.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 b954e72fba..911ae15aac 100644 --- a/extraconfig/all_nodes/random_string.j2.yaml +++ b/extraconfig/all_nodes/random_string.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 9e3713b8f9..a80d7bb6f4 100644 --- a/extraconfig/all_nodes/swap-partition.j2.yaml +++ b/extraconfig/all_nodes/swap-partition.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 e19fc2184a..03f74a90d2 100644 --- a/extraconfig/all_nodes/swap.j2.yaml +++ b/extraconfig/all_nodes/swap.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 b18dba6603..f8be39256f 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: pike +heat_template_version: queens 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 4a0e06ead4..f79bf7d5e8 100644 --- a/extraconfig/post_deploy/default.yaml +++ b/extraconfig/post_deploy/default.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: 'Extra Post Deployment Config' parameters: servers: diff --git a/extraconfig/post_deploy/example.yaml b/extraconfig/post_deploy/example.yaml index ee5a830cfa..b3f98839cc 100644 --- a/extraconfig/post_deploy/example.yaml +++ b/extraconfig/post_deploy/example.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 4e378b147a..75956f4136 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: pike +heat_template_version: queens 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 fe255c3972..0bb19a7156 100644 --- a/extraconfig/post_deploy/undercloud_post.yaml +++ b/extraconfig/post_deploy/undercloud_post.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 d296073e2d..adf748df20 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: pike +heat_template_version: queens 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 79cb7cbcfc..224c8db21c 100644 --- a/extraconfig/pre_network/config_then_reboot.yaml +++ b/extraconfig/pre_network/config_then_reboot.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Do some configuration, then reboot - sometimes needed for early-boot diff --git a/extraconfig/pre_network/contrail/compute_pre_network.yaml b/extraconfig/pre_network/contrail/compute_pre_network.yaml index 69e89f8778..099f2deffc 100644 --- a/extraconfig/pre_network/contrail/compute_pre_network.yaml +++ b/extraconfig/pre_network/contrail/compute_pre_network.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens # 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/extraconfig/pre_network/contrail/contrail_dpdk_pre_network.yaml b/extraconfig/pre_network/contrail/contrail_dpdk_pre_network.yaml index 4b3c673c4e..7c051968c4 100644 --- a/extraconfig/pre_network/contrail/contrail_dpdk_pre_network.yaml +++ b/extraconfig/pre_network/contrail/contrail_dpdk_pre_network.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens # 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/extraconfig/pre_network/host_config_and_reboot.role.j2.yaml b/extraconfig/pre_network/host_config_and_reboot.role.j2.yaml index fe52ef7e2c..f73e3a4813 100644 --- a/extraconfig/pre_network/host_config_and_reboot.role.j2.yaml +++ b/extraconfig/pre_network/host_config_and_reboot.role.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 87dbeaec4c..3b311f283e 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: pike +heat_template_version: queens description: > All configurations which require reboot should be initiated via PreNetworkConfig. After diff --git a/extraconfig/tasks/post_puppet_pacemaker.j2.yaml b/extraconfig/tasks/post_puppet_pacemaker.j2.yaml index 4d34aedf81..dbb3ea305e 100644 --- a/extraconfig/tasks/post_puppet_pacemaker.j2.yaml +++ b/extraconfig/tasks/post_puppet_pacemaker.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 102be8a856..dcf8a65161 100644 --- a/extraconfig/tasks/post_puppet_pacemaker_restart.yaml +++ b/extraconfig/tasks/post_puppet_pacemaker_restart.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 90f2630b0e..7f9816b18f 100644 --- a/extraconfig/tasks/pre_puppet_pacemaker.yaml +++ b/extraconfig/tasks/pre_puppet_pacemaker.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 ee06f0a9b9..23f0f1c5b7 100644 --- a/extraconfig/tasks/ssh/host_public_key.yaml +++ b/extraconfig/tasks/ssh/host_public_key.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 50bde65316..2bd80e7b05 100644 --- a/extraconfig/tasks/ssh/known_hosts_config.yaml +++ b/extraconfig/tasks/ssh/known_hosts_config.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: 'SSH Known Hosts Config' parameters: diff --git a/extraconfig/tasks/yum_update.yaml b/extraconfig/tasks/yum_update.yaml index 9daa83530f..8735cdf278 100644 --- a/extraconfig/tasks/yum_update.yaml +++ b/extraconfig/tasks/yum_update.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software-config for performing package updates using yum diff --git a/extraconfig/tasks/yum_update_noop.yaml b/extraconfig/tasks/yum_update_noop.yaml index 2ede5bea8d..36e5b73ffc 100644 --- a/extraconfig/tasks/yum_update_noop.yaml +++ b/extraconfig/tasks/yum_update_noop.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: 'No-op yum update task' resources: diff --git a/firstboot/os-net-config-mappings.yaml b/firstboot/os-net-config-mappings.yaml index c9b574e2a2..397c94e124 100644 --- a/firstboot/os-net-config-mappings.yaml +++ b/firstboot/os-net-config-mappings.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Configure os-net-config mappings for specific nodes diff --git a/firstboot/userdata_default.yaml b/firstboot/userdata_default.yaml index 0951b84b0b..a2c1d7a7b4 100644 --- a/firstboot/userdata_default.yaml +++ b/firstboot/userdata_default.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 43e966df3b..941bb43dce 100644 --- a/firstboot/userdata_dev_rsync.yaml +++ b/firstboot/userdata_dev_rsync.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > This is first boot configuration for development purposes. It allows diff --git a/firstboot/userdata_example.yaml b/firstboot/userdata_example.yaml index 32da7eda33..569c313010 100644 --- a/firstboot/userdata_example.yaml +++ b/firstboot/userdata_example.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens # 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 5223f93913..6d95b51930 100644 --- a/firstboot/userdata_heat_admin.yaml +++ b/firstboot/userdata_heat_admin.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 d32f223bce..4be0bf0a06 100644 --- a/firstboot/userdata_root_password.yaml +++ b/firstboot/userdata_root_password.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Uses cloud-init to enable root logins and set the root password. diff --git a/hosts-config.yaml b/hosts-config.yaml index f0d3c6a840..7f4d76b064 100644 --- a/hosts-config.yaml +++ b/hosts-config.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: 'All Hosts Config' parameters: diff --git a/net-config-bond.yaml b/net-config-bond.yaml index 8a97c854bc..9f753c71e1 100644 --- a/net-config-bond.yaml +++ b/net-config-bond.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config with 2 bonded nics on a bridge. parameters: diff --git a/net-config-bridge.yaml b/net-config-bridge.yaml index 0668245d8b..e6bd8580eb 100644 --- a/net-config-bridge.yaml +++ b/net-config-bridge.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config for a simple bridge. parameters: diff --git a/net-config-linux-bridge.yaml b/net-config-linux-bridge.yaml index 3964341ae6..6124cbde48 100644 --- a/net-config-linux-bridge.yaml +++ b/net-config-linux-bridge.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config for a simple bridge. parameters: diff --git a/net-config-noop.yaml b/net-config-noop.yaml index bdfda57795..eab0cdcf01 100644 --- a/net-config-noop.yaml +++ b/net-config-noop.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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.yaml b/net-config-static-bridge-with-external-dhcp.yaml index 0e0d590045..af6f9bdde6 100644 --- a/net-config-static-bridge-with-external-dhcp.yaml +++ b/net-config-static-bridge-with-external-dhcp.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config for a simple bridge configured with a static IP address for the ctlplane network. parameters: diff --git a/net-config-static-bridge.yaml b/net-config-static-bridge.yaml index e3e930d534..43f3ddfafa 100644 --- a/net-config-static-bridge.yaml +++ b/net-config-static-bridge.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config for a simple bridge configured with a static IP address for the ctlplane network. parameters: diff --git a/net-config-static.yaml b/net-config-static.yaml index 02e2fe6577..7ca06b13b4 100644 --- a/net-config-static.yaml +++ b/net-config-static.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config for a simple bridge. parameters: diff --git a/net-config-undercloud.yaml b/net-config-undercloud.yaml index af5bf029da..7f662776d0 100644 --- a/net-config-undercloud.yaml +++ b/net-config-undercloud.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config for a simple bridge configured with a static IP address for the ctlplane network. parameters: diff --git a/network/config/bond-with-vlans/ceph-storage.yaml b/network/config/bond-with-vlans/ceph-storage.yaml index bd15a1892f..698f227ea2 100644 --- a/network/config/bond-with-vlans/ceph-storage.yaml +++ b/network/config/bond-with-vlans/ceph-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config with 2 bonded nics on a bridge with VLANs attached for the ceph storage role. parameters: diff --git a/network/config/bond-with-vlans/cinder-storage.yaml b/network/config/bond-with-vlans/cinder-storage.yaml index 4ea3c470cd..c470eb4363 100644 --- a/network/config/bond-with-vlans/cinder-storage.yaml +++ b/network/config/bond-with-vlans/cinder-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config with 2 bonded nics on a bridge with VLANs attached for the cinder storage role. parameters: diff --git a/network/config/bond-with-vlans/compute-dpdk.yaml b/network/config/bond-with-vlans/compute-dpdk.yaml index 0459ad55be..f48ae7b299 100644 --- a/network/config/bond-with-vlans/compute-dpdk.yaml +++ b/network/config/bond-with-vlans/compute-dpdk.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config with OVS-DPDK bond in addition to the 2 bonded NICs with VLANs attached for the compute role. parameters: diff --git a/network/config/bond-with-vlans/compute.yaml b/network/config/bond-with-vlans/compute.yaml index 2acbc8777b..aa3e8ddff8 100644 --- a/network/config/bond-with-vlans/compute.yaml +++ b/network/config/bond-with-vlans/compute.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config with 2 bonded nics on a bridge with VLANs attached for the compute role. parameters: diff --git a/network/config/bond-with-vlans/controller-no-external.yaml b/network/config/bond-with-vlans/controller-no-external.yaml index 5560351805..0883f0d3f7 100644 --- a/network/config/bond-with-vlans/controller-no-external.yaml +++ b/network/config/bond-with-vlans/controller-no-external.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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.yaml b/network/config/bond-with-vlans/controller-v6.yaml index 69ab7539aa..6ad6c650ce 100644 --- a/network/config/bond-with-vlans/controller-v6.yaml +++ b/network/config/bond-with-vlans/controller-v6.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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/controller.yaml b/network/config/bond-with-vlans/controller.yaml index 70e41eb69c..6aabe29289 100644 --- a/network/config/bond-with-vlans/controller.yaml +++ b/network/config/bond-with-vlans/controller.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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/networker.yaml b/network/config/bond-with-vlans/networker.yaml index 45994c72e8..654a220c2a 100644 --- a/network/config/bond-with-vlans/networker.yaml +++ b/network/config/bond-with-vlans/networker.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config with 2 bonded nics on a bridge with VLANs attached for a dedicated Neutron networker role. parameters: diff --git a/network/config/bond-with-vlans/swift-storage.yaml b/network/config/bond-with-vlans/swift-storage.yaml index c31bf22584..7afd63810a 100644 --- a/network/config/bond-with-vlans/swift-storage.yaml +++ b/network/config/bond-with-vlans/swift-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config with 2 bonded nics on a bridge with VLANs attached for the swift storage role. parameters: diff --git a/network/config/contrail/contrail-nic-config-compute.yaml b/network/config/contrail/contrail-nic-config-compute.yaml index 5f9e919834..cb62d29607 100644 --- a/network/config/contrail/contrail-nic-config-compute.yaml +++ b/network/config/contrail/contrail-nic-config-compute.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config to configure multiple interfaces diff --git a/network/config/contrail/contrail-nic-config.yaml b/network/config/contrail/contrail-nic-config.yaml index fb78cacafb..691196b953 100644 --- a/network/config/contrail/contrail-nic-config.yaml +++ b/network/config/contrail/contrail-nic-config.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config to configure multiple interfaces diff --git a/network/config/multiple-nics/ceph-storage.yaml b/network/config/multiple-nics/ceph-storage.yaml index 8448f84f4b..1802d8f2f9 100644 --- a/network/config/multiple-nics/ceph-storage.yaml +++ b/network/config/multiple-nics/ceph-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config to configure multiple interfaces for the ceph storage role. parameters: diff --git a/network/config/multiple-nics/cinder-storage.yaml b/network/config/multiple-nics/cinder-storage.yaml index 57882e22e0..214406b1e1 100644 --- a/network/config/multiple-nics/cinder-storage.yaml +++ b/network/config/multiple-nics/cinder-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config to configure multiple interfaces for the cinder storage role. parameters: diff --git a/network/config/multiple-nics/compute-dvr.yaml b/network/config/multiple-nics/compute-dvr.yaml index 562a63d93e..8a55c44262 100644 --- a/network/config/multiple-nics/compute-dvr.yaml +++ b/network/config/multiple-nics/compute-dvr.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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/compute.yaml b/network/config/multiple-nics/compute.yaml index febfed0ce4..7a2e19305f 100644 --- a/network/config/multiple-nics/compute.yaml +++ b/network/config/multiple-nics/compute.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config to configure multiple interfaces for the compute role. parameters: diff --git a/network/config/multiple-nics/controller-v6.yaml b/network/config/multiple-nics/controller-v6.yaml index 17544f2204..e71bf7335d 100644 --- a/network/config/multiple-nics/controller-v6.yaml +++ b/network/config/multiple-nics/controller-v6.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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/controller.yaml b/network/config/multiple-nics/controller.yaml index 7d9dbe7aa6..832800bc67 100644 --- a/network/config/multiple-nics/controller.yaml +++ b/network/config/multiple-nics/controller.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config to configure multiple interfaces for the controller role. parameters: diff --git a/network/config/multiple-nics/networker.yaml b/network/config/multiple-nics/networker.yaml index abee66ca0e..ac8c9c041e 100644 --- a/network/config/multiple-nics/networker.yaml +++ b/network/config/multiple-nics/networker.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config to configure multiple interfaces for a dedicated Neutron networker role. parameters: diff --git a/network/config/multiple-nics/swift-storage.yaml b/network/config/multiple-nics/swift-storage.yaml index cf547918f2..6c21323a53 100644 --- a/network/config/multiple-nics/swift-storage.yaml +++ b/network/config/multiple-nics/swift-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config to configure multiple interfaces for the swift storage role. parameters: diff --git a/network/config/single-nic-linux-bridge-vlans/ceph-storage.yaml b/network/config/single-nic-linux-bridge-vlans/ceph-storage.yaml index b22f633a80..dbc1c8f8b5 100644 --- a/network/config/single-nic-linux-bridge-vlans/ceph-storage.yaml +++ b/network/config/single-nic-linux-bridge-vlans/ceph-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config to configure VLANs for the ceph storage role. parameters: diff --git a/network/config/single-nic-linux-bridge-vlans/cinder-storage.yaml b/network/config/single-nic-linux-bridge-vlans/cinder-storage.yaml index 1c5a8c9aef..284b3ddc78 100644 --- a/network/config/single-nic-linux-bridge-vlans/cinder-storage.yaml +++ b/network/config/single-nic-linux-bridge-vlans/cinder-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config to configure VLANs for the cinder storage role. parameters: diff --git a/network/config/single-nic-linux-bridge-vlans/compute.yaml b/network/config/single-nic-linux-bridge-vlans/compute.yaml index f4fd5fba14..14d5732566 100644 --- a/network/config/single-nic-linux-bridge-vlans/compute.yaml +++ b/network/config/single-nic-linux-bridge-vlans/compute.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config to configure VLANs for the compute role. parameters: diff --git a/network/config/single-nic-linux-bridge-vlans/controller-v6.yaml b/network/config/single-nic-linux-bridge-vlans/controller-v6.yaml index 44fc961c61..6130d875ea 100644 --- a/network/config/single-nic-linux-bridge-vlans/controller-v6.yaml +++ b/network/config/single-nic-linux-bridge-vlans/controller-v6.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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/controller.yaml b/network/config/single-nic-linux-bridge-vlans/controller.yaml index 0a54145a93..a250572df3 100644 --- a/network/config/single-nic-linux-bridge-vlans/controller.yaml +++ b/network/config/single-nic-linux-bridge-vlans/controller.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config to configure VLANs for the controller role. parameters: diff --git a/network/config/single-nic-linux-bridge-vlans/networker.yaml b/network/config/single-nic-linux-bridge-vlans/networker.yaml index 7dd48944cb..072b33a8d7 100644 --- a/network/config/single-nic-linux-bridge-vlans/networker.yaml +++ b/network/config/single-nic-linux-bridge-vlans/networker.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config to configure VLANs for a dedicated Neutron networker role. parameters: diff --git a/network/config/single-nic-linux-bridge-vlans/swift-storage.yaml b/network/config/single-nic-linux-bridge-vlans/swift-storage.yaml index 2649391f6c..cdd693c6b7 100644 --- a/network/config/single-nic-linux-bridge-vlans/swift-storage.yaml +++ b/network/config/single-nic-linux-bridge-vlans/swift-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config to configure VLANs for the swift storage role. parameters: diff --git a/network/config/single-nic-vlans/ceph-storage.yaml b/network/config/single-nic-vlans/ceph-storage.yaml index ebcc721cc7..00777166f0 100644 --- a/network/config/single-nic-vlans/ceph-storage.yaml +++ b/network/config/single-nic-vlans/ceph-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config to configure VLANs for the ceph storage role. parameters: diff --git a/network/config/single-nic-vlans/cinder-storage.yaml b/network/config/single-nic-vlans/cinder-storage.yaml index d2548e4e0b..64d1e61969 100644 --- a/network/config/single-nic-vlans/cinder-storage.yaml +++ b/network/config/single-nic-vlans/cinder-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config to configure VLANs for the cinder storage role. parameters: diff --git a/network/config/single-nic-vlans/compute.yaml b/network/config/single-nic-vlans/compute.yaml index 78814af190..09a097c30b 100644 --- a/network/config/single-nic-vlans/compute.yaml +++ b/network/config/single-nic-vlans/compute.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config to configure VLANs for the compute role. parameters: diff --git a/network/config/single-nic-vlans/controller-no-external.yaml b/network/config/single-nic-vlans/controller-no-external.yaml index 1dc9a6f350..6b717c550b 100644 --- a/network/config/single-nic-vlans/controller-no-external.yaml +++ b/network/config/single-nic-vlans/controller-no-external.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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.yaml b/network/config/single-nic-vlans/controller-v6.yaml index f1055ae381..fc28318680 100644 --- a/network/config/single-nic-vlans/controller-v6.yaml +++ b/network/config/single-nic-vlans/controller-v6.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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/controller.yaml b/network/config/single-nic-vlans/controller.yaml index 171fcf5d9b..54968f8445 100644 --- a/network/config/single-nic-vlans/controller.yaml +++ b/network/config/single-nic-vlans/controller.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config to configure VLANs for the controller role. parameters: diff --git a/network/config/single-nic-vlans/networker.yaml b/network/config/single-nic-vlans/networker.yaml index 2502984a8c..e5a41a3b1a 100644 --- a/network/config/single-nic-vlans/networker.yaml +++ b/network/config/single-nic-vlans/networker.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config to configure VLANs for a dedicated Neutron networker role. parameters: diff --git a/network/config/single-nic-vlans/swift-storage.yaml b/network/config/single-nic-vlans/swift-storage.yaml index 99ab66c166..53c934037a 100644 --- a/network/config/single-nic-vlans/swift-storage.yaml +++ b/network/config/single-nic-vlans/swift-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Software Config to drive os-net-config to configure VLANs for the swift storage role. parameters: diff --git a/network/endpoints/build_endpoint_map.py b/network/endpoints/build_endpoint_map.py index 26b4585ef7..f3c66f3d21 100755 --- a/network/endpoints/build_endpoint_map.py +++ b/network/endpoints/build_endpoint_map.py @@ -197,7 +197,7 @@ def template_endpoint_items(config): def generate_endpoint_map_template(config): return collections.OrderedDict([ - ('heat_template_version', 'pike'), + ('heat_template_version', 'queens'), ('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 1421a2df03..f27af13927 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: pike +heat_template_version: queens 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 61a5b57cc2..1e99de7c8d 100644 --- a/network/network.j2 +++ b/network/network.j2 @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > {{network.name}} network definition (automatically generated). diff --git a/network/networks.j2.yaml b/network/networks.j2.yaml index 48c509df47..a27d68e423 100644 --- a/network/networks.j2.yaml +++ b/network/networks.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: Create networks to split out Overcloud traffic diff --git a/network/ports/ctlplane_vip.yaml b/network/ports/ctlplane_vip.yaml index f874c30de3..6b43b31d22 100644 --- a/network/ports/ctlplane_vip.yaml +++ b/network/ports/ctlplane_vip.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 64fdce6528..284bb3f595 100644 --- a/network/ports/from_service.yaml +++ b/network/ports/from_service.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 2735a69e17..eef598a3e9 100644 --- a/network/ports/from_service_v6.yaml +++ b/network/ports/from_service_v6.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 16bd398609..deb8f2ba4d 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: pike +heat_template_version: queens parameters: ControlPlaneIpList: diff --git a/network/ports/net_ip_map.j2.yaml b/network/ports/net_ip_map.j2.yaml index f01d624af3..805aeed2b6 100644 --- a/network/ports/net_ip_map.j2.yaml +++ b/network/ports/net_ip_map.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens parameters: ControlPlaneIp: diff --git a/network/ports/net_vip_map_external.j2.yaml b/network/ports/net_vip_map_external.j2.yaml index b17f48b5c9..ca2ed07363 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: pike +heat_template_version: queens 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 5eff73c118..ffad7a1e51 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: pike +heat_template_version: queens parameters: # Set these via parameter defaults to configure external VIPs diff --git a/network/ports/noop.yaml b/network/ports/noop.yaml index 9f39c4ffb7..8e8659c4f0 100644 --- a/network/ports/noop.yaml +++ b/network/ports/noop.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 2088d8404e..3b4c59354f 100644 --- a/network/ports/port.j2 +++ b/network/ports/port.j2 @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 14b93692bc..3448e64516 100644 --- a/network/ports/port_from_pool.j2 +++ b/network/ports/port_from_pool.j2 @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 f47760c8b8..89747ccae2 100644 --- a/network/ports/vip.yaml +++ b/network/ports/vip.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 90525a3177..3b45d7efe4 100644 --- a/network/ports/vip_v6.yaml +++ b/network/ports/vip_v6.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 dfb0e9104d..beeedaa84a 100644 --- a/network/service_net_map.j2.yaml +++ b/network/service_net_map.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Mapping of service_name_network -> network name diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index 8884cfefa8..0e8ab00f09 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: pike +heat_template_version: queens 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 e231b5334a..e44a48c863 100644 --- a/puppet/all-nodes-config.j2.yaml +++ b/puppet/all-nodes-config.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: 'All Nodes Config for Puppet' parameters: diff --git a/puppet/config.role.j2.yaml b/puppet/config.role.j2.yaml index 832656bafc..6f449c2000 100644 --- a/puppet/config.role.j2.yaml +++ b/puppet/config.role.j2.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > A software config which runs puppet on the {{role}} role diff --git a/puppet/deploy-artifacts.yaml b/puppet/deploy-artifacts.yaml index 3a7a73c059..85e48f9df9 100644 --- a/puppet/deploy-artifacts.yaml +++ b/puppet/deploy-artifacts.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 e1c464b0eb..acd803c769 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: pike +heat_template_version: queens 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 3b7bf40cca..4cd5038983 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: pike +heat_template_version: queens 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 6e010deae3..52ea3e31cb 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: pike +heat_template_version: queens 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 69cd703396..e11bd332b4 100644 --- a/puppet/extraconfig/pre_deploy/controller/multiple.yaml +++ b/puppet/extraconfig/pre_deploy/controller/multiple.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 cda598a511..640cdea2aa 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: pike +heat_template_version: queens 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 b346bbd40a..34b49b90c0 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: pike +heat_template_version: queens description: Configure hieradata for Cisco N1KV configuration diff --git a/puppet/extraconfig/pre_deploy/default.yaml b/puppet/extraconfig/pre_deploy/default.yaml index f14e13ff5b..474a8307e2 100644 --- a/puppet/extraconfig/pre_deploy/default.yaml +++ b/puppet/extraconfig/pre_deploy/default.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 7fb67d84a5..33ae3e28af 100644 --- a/puppet/extraconfig/pre_deploy/per_node.yaml +++ b/puppet/extraconfig/pre_deploy/per_node.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: Configure hieradata overrides for specific nodes diff --git a/puppet/extraconfig/tls/ca-inject.yaml b/puppet/extraconfig/tls/ca-inject.yaml index 11f2769b6c..f325cf7b0f 100644 --- a/puppet/extraconfig/tls/ca-inject.yaml +++ b/puppet/extraconfig/tls/ca-inject.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 9c6a402d9c..edde96132f 100644 --- a/puppet/extraconfig/tls/freeipa-enroll.yaml +++ b/puppet/extraconfig/tls/freeipa-enroll.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: Enroll nodes to FreeIPA diff --git a/puppet/extraconfig/tls/tls-cert-inject.yaml b/puppet/extraconfig/tls/tls-cert-inject.yaml index 99fa7cdf55..d32fc62f16 100644 --- a/puppet/extraconfig/tls/tls-cert-inject.yaml +++ b/puppet/extraconfig/tls/tls-cert-inject.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 e1552a7581..b184e4fac5 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: pike +heat_template_version: queens description: 'OpenStack {{role.name}} node configured by Puppet' parameters: {%- set default_flavor_name = 'baremetal' %} diff --git a/puppet/services/aodh-api.yaml b/puppet/services/aodh-api.yaml index f0493f0ee0..e106c58998 100644 --- a/puppet/services/aodh-api.yaml +++ b/puppet/services/aodh-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Aodh API service configured with Puppet diff --git a/puppet/services/aodh-base.yaml b/puppet/services/aodh-base.yaml index 6c526e81dd..b613dee7e3 100644 --- a/puppet/services/aodh-base.yaml +++ b/puppet/services/aodh-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Aodh service configured with Puppet diff --git a/puppet/services/aodh-evaluator.yaml b/puppet/services/aodh-evaluator.yaml index eedb291f2a..6590892c1d 100644 --- a/puppet/services/aodh-evaluator.yaml +++ b/puppet/services/aodh-evaluator.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Aodh Evaluator service configured with Puppet diff --git a/puppet/services/aodh-listener.yaml b/puppet/services/aodh-listener.yaml index 631a3dc143..da7aca9950 100644 --- a/puppet/services/aodh-listener.yaml +++ b/puppet/services/aodh-listener.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Aodh Listener service configured with Puppet diff --git a/puppet/services/aodh-notifier.yaml b/puppet/services/aodh-notifier.yaml index 1bc5e4df9d..8752db3e7f 100644 --- a/puppet/services/aodh-notifier.yaml +++ b/puppet/services/aodh-notifier.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Aodh Notifier service configured with Puppet diff --git a/puppet/services/apache.yaml b/puppet/services/apache.yaml index c398000e14..33f5b70b0a 100644 --- a/puppet/services/apache.yaml +++ b/puppet/services/apache.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Apache service configured with Puppet. Note this is typically included diff --git a/puppet/services/auditd.yaml b/puppet/services/auditd.yaml index 3a676ddffa..99c1832a4b 100644 --- a/puppet/services/auditd.yaml +++ b/puppet/services/auditd.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > AuditD configured with Puppet diff --git a/puppet/services/barbican-api.yaml b/puppet/services/barbican-api.yaml index b9113eea45..fb865960c8 100644 --- a/puppet/services/barbican-api.yaml +++ b/puppet/services/barbican-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Barbican API service configured with Puppet diff --git a/puppet/services/barbican-backend-simple-crypto.yaml b/puppet/services/barbican-backend-simple-crypto.yaml index af7dfd99df..a7466a114f 100644 --- a/puppet/services/barbican-backend-simple-crypto.yaml +++ b/puppet/services/barbican-backend-simple-crypto.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Barbican API simple crypto backend configured with Puppet diff --git a/puppet/services/ca-certs.yaml b/puppet/services/ca-certs.yaml index 46446f14ac..9e88f375ac 100644 --- a/puppet/services/ca-certs.yaml +++ b/puppet/services/ca-certs.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > HAproxy service configured with Puppet diff --git a/puppet/services/ceilometer-agent-central.yaml b/puppet/services/ceilometer-agent-central.yaml index 2d3c91a935..ee0dcbd5ee 100644 --- a/puppet/services/ceilometer-agent-central.yaml +++ b/puppet/services/ceilometer-agent-central.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 27bc50f387..5a8a321764 100644 --- a/puppet/services/ceilometer-agent-compute.yaml +++ b/puppet/services/ceilometer-agent-compute.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 f61f90839f..237bddc828 100644 --- a/puppet/services/ceilometer-agent-ipmi.yaml +++ b/puppet/services/ceilometer-agent-ipmi.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 d6e98ae822..fd57a7c37a 100644 --- a/puppet/services/ceilometer-agent-notification.yaml +++ b/puppet/services/ceilometer-agent-notification.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Ceilometer Notification Agent service configured with Puppet diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml index 7b57786e2f..41ef129f61 100644 --- a/puppet/services/ceilometer-base.yaml +++ b/puppet/services/ceilometer-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Ceilometer service configured with Puppet diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml index e120dce3a9..b667a66b31 100644 --- a/puppet/services/ceph-base.yaml +++ b/puppet/services/ceph-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Ceph base service. Shared by all Ceph services. diff --git a/puppet/services/ceph-client.yaml b/puppet/services/ceph-client.yaml index 0bee5fcd23..d5a0ec4d65 100644 --- a/puppet/services/ceph-client.yaml +++ b/puppet/services/ceph-client.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Ceph Client service. diff --git a/puppet/services/ceph-external.yaml b/puppet/services/ceph-external.yaml index 1459b85167..c71a4f8938 100644 --- a/puppet/services/ceph-external.yaml +++ b/puppet/services/ceph-external.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Ceph External service. diff --git a/puppet/services/ceph-mds.yaml b/puppet/services/ceph-mds.yaml index ad799edbb4..f48c71118a 100644 --- a/puppet/services/ceph-mds.yaml +++ b/puppet/services/ceph-mds.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Ceph MDS service. diff --git a/puppet/services/ceph-mon.yaml b/puppet/services/ceph-mon.yaml index 5800c558cc..8ab911f2c6 100644 --- a/puppet/services/ceph-mon.yaml +++ b/puppet/services/ceph-mon.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Ceph Monitor service. diff --git a/puppet/services/ceph-osd.yaml b/puppet/services/ceph-osd.yaml index 8f43b08a54..088f8d669c 100644 --- a/puppet/services/ceph-osd.yaml +++ b/puppet/services/ceph-osd.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Ceph OSD service. diff --git a/puppet/services/ceph-rgw.yaml b/puppet/services/ceph-rgw.yaml index 2962946154..9df00e1b49 100644 --- a/puppet/services/ceph-rgw.yaml +++ b/puppet/services/ceph-rgw.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Ceph RadosGW service. diff --git a/puppet/services/certmonger-user.yaml b/puppet/services/certmonger-user.yaml index 216c7ad39f..a0b152954c 100644 --- a/puppet/services/certmonger-user.yaml +++ b/puppet/services/certmonger-user.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Requests certificates using certmonger through Puppet diff --git a/puppet/services/cinder-api.yaml b/puppet/services/cinder-api.yaml index 193c6ba3a4..dbb176b129 100644 --- a/puppet/services/cinder-api.yaml +++ b/puppet/services/cinder-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 c8b8bd8f66..46244aa975 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: pike +heat_template_version: queens 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 1a3beab51b..eab0c9e9f3 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: pike +heat_template_version: queens description: > Openstack Cinder Dell EMC VMAX iscsi backend diff --git a/puppet/services/cinder-backend-dellps.yaml b/puppet/services/cinder-backend-dellps.yaml index 388e49b772..d97795fe2f 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: pike +heat_template_version: queens 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 136852a6a0..cebca6230f 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: pike +heat_template_version: queens 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 9cbac24629..8ee9da96d4 100644 --- a/puppet/services/cinder-backend-netapp.yaml +++ b/puppet/services/cinder-backend-netapp.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: Openstack Cinder Netapp backend diff --git a/puppet/services/cinder-backend-pure.yaml b/puppet/services/cinder-backend-pure.yaml index 6f4de25b9d..eb527fcdc3 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: pike +heat_template_version: queens description: > Openstack Cinder Pure Storage FlashArray backend diff --git a/puppet/services/cinder-backend-scaleio.yaml b/puppet/services/cinder-backend-scaleio.yaml index 97bac05d53..48ba0a2c34 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: pike +heat_template_version: queens 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 4d142021a4..eee446bf3e 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: pike +heat_template_version: queens description: > Openstack Veritas HyperScale backend diff --git a/puppet/services/cinder-backup.yaml b/puppet/services/cinder-backup.yaml index 7ac4321b0e..eb05deceee 100644 --- a/puppet/services/cinder-backup.yaml +++ b/puppet/services/cinder-backup.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Cinder Backup service configured with Puppet diff --git a/puppet/services/cinder-base.yaml b/puppet/services/cinder-base.yaml index f1bc3450d9..6cc991a836 100644 --- a/puppet/services/cinder-base.yaml +++ b/puppet/services/cinder-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 8f443cc8f4..da065bb6b5 100644 --- a/puppet/services/cinder-hpelefthand-iscsi.yaml +++ b/puppet/services/cinder-hpelefthand-iscsi.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Configure Cinder HPELeftHandISCSIDriver diff --git a/puppet/services/cinder-scheduler.yaml b/puppet/services/cinder-scheduler.yaml index 540a3523b3..7aeaaa731b 100644 --- a/puppet/services/cinder-scheduler.yaml +++ b/puppet/services/cinder-scheduler.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Cinder Scheduler service configured with Puppet diff --git a/puppet/services/cinder-volume.yaml b/puppet/services/cinder-volume.yaml index 1567a75a0e..9507d1d259 100644 --- a/puppet/services/cinder-volume.yaml +++ b/puppet/services/cinder-volume.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Cinder Volume service configured with Puppet diff --git a/puppet/services/congress.yaml b/puppet/services/congress.yaml index 3abb47756a..f0e0b45a7a 100644 --- a/puppet/services/congress.yaml +++ b/puppet/services/congress.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Congress service configured with Puppet diff --git a/puppet/services/database/mongodb-base.yaml b/puppet/services/database/mongodb-base.yaml index c218e8b5ac..28240d6d30 100644 --- a/puppet/services/database/mongodb-base.yaml +++ b/puppet/services/database/mongodb-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Configuration details for MongoDB service using composable roles diff --git a/puppet/services/database/mongodb.yaml b/puppet/services/database/mongodb.yaml index dad1148435..7fc43038ad 100644 --- a/puppet/services/database/mongodb.yaml +++ b/puppet/services/database/mongodb.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > MongoDb service deployment using puppet diff --git a/puppet/services/database/mysql-client.yaml b/puppet/services/database/mysql-client.yaml index 2eb207895c..6215b60587 100644 --- a/puppet/services/database/mysql-client.yaml +++ b/puppet/services/database/mysql-client.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Mysql client settings diff --git a/puppet/services/database/mysql.yaml b/puppet/services/database/mysql.yaml index c1f54bb678..cb285ec6ba 100644 --- a/puppet/services/database/mysql.yaml +++ b/puppet/services/database/mysql.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > MySQL service deployment using puppet diff --git a/puppet/services/database/redis-base.yaml b/puppet/services/database/redis-base.yaml index 8436062afe..2ad6c17223 100644 --- a/puppet/services/database/redis-base.yaml +++ b/puppet/services/database/redis-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Redis service configured with Puppet diff --git a/puppet/services/database/redis.yaml b/puppet/services/database/redis.yaml index 810e467e81..893792f832 100644 --- a/puppet/services/database/redis.yaml +++ b/puppet/services/database/redis.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Redis service configured with Puppet diff --git a/puppet/services/disabled/glance-registry-disabled.yaml b/puppet/services/disabled/glance-registry-disabled.yaml index 238e7395e6..9079e99b73 100644 --- a/puppet/services/disabled/glance-registry-disabled.yaml +++ b/puppet/services/disabled/glance-registry-disabled.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 f7935712c7..f7116af444 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: pike +heat_template_version: queens 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 0c6e2bbb41..808122179e 100644 --- a/puppet/services/disabled/mongodb-disabled.yaml +++ b/puppet/services/disabled/mongodb-disabled.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Mongodb service, disabled by default since pike diff --git a/puppet/services/docker.yaml b/puppet/services/docker.yaml index 2d8d336379..2bf1b8a166 100644 --- a/puppet/services/docker.yaml +++ b/puppet/services/docker.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Configures docker on the host diff --git a/puppet/services/ec2-api.yaml b/puppet/services/ec2-api.yaml index 6edd498535..929c44c9ee 100644 --- a/puppet/services/ec2-api.yaml +++ b/puppet/services/ec2-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack EC2-API service configured with Puppet diff --git a/puppet/services/etcd.yaml b/puppet/services/etcd.yaml index 4828fcb94f..42e4d7cc2a 100644 --- a/puppet/services/etcd.yaml +++ b/puppet/services/etcd.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Etcd service configured with Puppet diff --git a/puppet/services/external-swift-proxy.yaml b/puppet/services/external-swift-proxy.yaml index ac1f11ac89..e24bd92db6 100644 --- a/puppet/services/external-swift-proxy.yaml +++ b/puppet/services/external-swift-proxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > External Swift Proxy endpoint configured with Puppet diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml index 98610d4f16..5c05c9cb0f 100644 --- a/puppet/services/glance-api.yaml +++ b/puppet/services/glance-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Glance API service configured with Puppet diff --git a/puppet/services/gnocchi-api.yaml b/puppet/services/gnocchi-api.yaml index 99f6b13bda..579d94b9aa 100644 --- a/puppet/services/gnocchi-api.yaml +++ b/puppet/services/gnocchi-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Gnocchi service configured with Puppet diff --git a/puppet/services/gnocchi-base.yaml b/puppet/services/gnocchi-base.yaml index 8ee690c27d..638170cecc 100644 --- a/puppet/services/gnocchi-base.yaml +++ b/puppet/services/gnocchi-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Gnocchi service configured with Puppet diff --git a/puppet/services/gnocchi-metricd.yaml b/puppet/services/gnocchi-metricd.yaml index 1918c6e13b..08d3166aaf 100644 --- a/puppet/services/gnocchi-metricd.yaml +++ b/puppet/services/gnocchi-metricd.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Gnocchi service configured with Puppet diff --git a/puppet/services/gnocchi-statsd.yaml b/puppet/services/gnocchi-statsd.yaml index 85eba5d4c8..ae831e0634 100644 --- a/puppet/services/gnocchi-statsd.yaml +++ b/puppet/services/gnocchi-statsd.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Gnocchi service configured with Puppet diff --git a/puppet/services/haproxy-internal-tls-certmonger.yaml b/puppet/services/haproxy-internal-tls-certmonger.yaml index e0173d88c4..1f2ef4de63 100644 --- a/puppet/services/haproxy-internal-tls-certmonger.yaml +++ b/puppet/services/haproxy-internal-tls-certmonger.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 cdfc41cfde..40f194ad53 100644 --- a/puppet/services/haproxy-public-tls-certmonger.yaml +++ b/puppet/services/haproxy-public-tls-certmonger.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > HAProxy deployment with TLS enabled, powered by certmonger diff --git a/puppet/services/haproxy.yaml b/puppet/services/haproxy.yaml index 6b2d028f2c..a002d2ad7d 100644 --- a/puppet/services/haproxy.yaml +++ b/puppet/services/haproxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > HAproxy service configured with Puppet diff --git a/puppet/services/heat-api-cfn.yaml b/puppet/services/heat-api-cfn.yaml index 28bb86588f..ecd7e3b137 100644 --- a/puppet/services/heat-api-cfn.yaml +++ b/puppet/services/heat-api-cfn.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Openstack Heat CloudFormation API service configured with Puppet diff --git a/puppet/services/heat-api-cloudwatch.yaml b/puppet/services/heat-api-cloudwatch.yaml index 689251a37f..e123cb0986 100644 --- a/puppet/services/heat-api-cloudwatch.yaml +++ b/puppet/services/heat-api-cloudwatch.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Openstack Heat CloudWatch API service configured with Puppet diff --git a/puppet/services/heat-api.yaml b/puppet/services/heat-api.yaml index 51f52a7160..8a423f38ba 100644 --- a/puppet/services/heat-api.yaml +++ b/puppet/services/heat-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Openstack Heat API service configured with Puppet diff --git a/puppet/services/heat-base.yaml b/puppet/services/heat-base.yaml index 017a59ffb2..b60d05cd0e 100644 --- a/puppet/services/heat-base.yaml +++ b/puppet/services/heat-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 c69d05ec1e..0bf0c63f19 100644 --- a/puppet/services/heat-engine.yaml +++ b/puppet/services/heat-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Openstack Heat Engine service configured with Puppet diff --git a/puppet/services/horizon.yaml b/puppet/services/horizon.yaml index 09b6ae77ea..bb3fb42cb7 100644 --- a/puppet/services/horizon.yaml +++ b/puppet/services/horizon.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Horizon service configured with Puppet diff --git a/puppet/services/ironic-api.yaml b/puppet/services/ironic-api.yaml index f003be72a6..d2272b8d23 100644 --- a/puppet/services/ironic-api.yaml +++ b/puppet/services/ironic-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Ironic API configured with Puppet diff --git a/puppet/services/ironic-base.yaml b/puppet/services/ironic-base.yaml index 6a99b9730d..28c7a73f3a 100644 --- a/puppet/services/ironic-base.yaml +++ b/puppet/services/ironic-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Ironic services configured with Puppet diff --git a/puppet/services/ironic-conductor.yaml b/puppet/services/ironic-conductor.yaml index 1ed1ee7ccf..9a3c393bf8 100644 --- a/puppet/services/ironic-conductor.yaml +++ b/puppet/services/ironic-conductor.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Ironic conductor configured with Puppet diff --git a/puppet/services/ironic-inspector.yaml b/puppet/services/ironic-inspector.yaml index b6965b459c..a20878eca1 100644 --- a/puppet/services/ironic-inspector.yaml +++ b/puppet/services/ironic-inspector.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Ironic Inspector configured with Puppet (EXPERIMENTAL) diff --git a/puppet/services/iscsid.yaml b/puppet/services/iscsid.yaml index 222977e94e..cc007ee9ed 100644 --- a/puppet/services/iscsid.yaml +++ b/puppet/services/iscsid.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Configure iscsid diff --git a/puppet/services/keepalived.yaml b/puppet/services/keepalived.yaml index a258ee419f..c6c342dbce 100644 --- a/puppet/services/keepalived.yaml +++ b/puppet/services/keepalived.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Keepalived service configured with Puppet diff --git a/puppet/services/kernel.yaml b/puppet/services/kernel.yaml index 1c2da401d4..624b68fca0 100644 --- a/puppet/services/kernel.yaml +++ b/puppet/services/kernel.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 d0ce197df6..950154d123 100644 --- a/puppet/services/keystone.yaml +++ b/puppet/services/keystone.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Keystone service configured with Puppet diff --git a/puppet/services/logging/fluentd-config.yaml b/puppet/services/logging/fluentd-config.yaml index a2390545f7..cebf137e5a 100644 --- a/puppet/services/logging/fluentd-config.yaml +++ b/puppet/services/logging/fluentd-config.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: Fluentd logging configuration diff --git a/puppet/services/logging/fluentd.yaml b/puppet/services/logging/fluentd.yaml index 1c5a169990..db475b0698 100644 --- a/puppet/services/logging/fluentd.yaml +++ b/puppet/services/logging/fluentd.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: Fluentd client configured with Puppet diff --git a/puppet/services/manila-api.yaml b/puppet/services/manila-api.yaml index 9fc76bf65c..9b3a7e49af 100644 --- a/puppet/services/manila-api.yaml +++ b/puppet/services/manila-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Manila-api service configured with Puppet diff --git a/puppet/services/manila-backend-cephfs.yaml b/puppet/services/manila-backend-cephfs.yaml index 9207d99f49..9952ed4c72 100644 --- a/puppet/services/manila-backend-cephfs.yaml +++ b/puppet/services/manila-backend-cephfs.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Openstack Manila Cephfs backend diff --git a/puppet/services/manila-backend-isilon.yaml b/puppet/services/manila-backend-isilon.yaml index 6d8a1fb6be..882aa1c111 100644 --- a/puppet/services/manila-backend-isilon.yaml +++ b/puppet/services/manila-backend-isilon.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Openstack Manila isilon backend. diff --git a/puppet/services/manila-backend-netapp.yaml b/puppet/services/manila-backend-netapp.yaml index d4caedf046..f6a906a9ae 100644 --- a/puppet/services/manila-backend-netapp.yaml +++ b/puppet/services/manila-backend-netapp.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Openstack Manila netapp backend. diff --git a/puppet/services/manila-backend-unity.yaml b/puppet/services/manila-backend-unity.yaml index 9c8310e72b..8d77360374 100644 --- a/puppet/services/manila-backend-unity.yaml +++ b/puppet/services/manila-backend-unity.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Openstack Manila unity backend. diff --git a/puppet/services/manila-backend-vmax.yaml b/puppet/services/manila-backend-vmax.yaml index cdd32f5d31..e77033dcc9 100644 --- a/puppet/services/manila-backend-vmax.yaml +++ b/puppet/services/manila-backend-vmax.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Openstack Manila vmax backend. diff --git a/puppet/services/manila-backend-vnx.yaml b/puppet/services/manila-backend-vnx.yaml index 13dde4a8be..ba088c2fee 100644 --- a/puppet/services/manila-backend-vnx.yaml +++ b/puppet/services/manila-backend-vnx.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Openstack Manila vnx backend. diff --git a/puppet/services/manila-base.yaml b/puppet/services/manila-base.yaml index cd582ba403..9c51f02f64 100644 --- a/puppet/services/manila-base.yaml +++ b/puppet/services/manila-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 364a1a3de3..248d9b8e21 100644 --- a/puppet/services/manila-scheduler.yaml +++ b/puppet/services/manila-scheduler.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Manila-scheduler service configured with Puppet diff --git a/puppet/services/manila-share.yaml b/puppet/services/manila-share.yaml index 08c3648392..b8f69c1808 100644 --- a/puppet/services/manila-share.yaml +++ b/puppet/services/manila-share.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Manila-share service configured with Puppet diff --git a/puppet/services/memcached.yaml b/puppet/services/memcached.yaml index cfd0068a51..d3348e95ce 100644 --- a/puppet/services/memcached.yaml +++ b/puppet/services/memcached.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Memcached service configured with Puppet diff --git a/puppet/services/metrics/collectd.yaml b/puppet/services/metrics/collectd.yaml index 7fd301b2b8..369971b460 100644 --- a/puppet/services/metrics/collectd.yaml +++ b/puppet/services/metrics/collectd.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: Collectd client service diff --git a/puppet/services/mistral-api.yaml b/puppet/services/mistral-api.yaml index 10de99a9df..903b57ab13 100644 --- a/puppet/services/mistral-api.yaml +++ b/puppet/services/mistral-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Openstack Mistral API service configured with Puppet diff --git a/puppet/services/mistral-base.yaml b/puppet/services/mistral-base.yaml index 0e9029735e..949ee997f6 100644 --- a/puppet/services/mistral-base.yaml +++ b/puppet/services/mistral-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 5c8aa1dbfc..b450f7453b 100644 --- a/puppet/services/mistral-engine.yaml +++ b/puppet/services/mistral-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 689b034cf1..3486a23c71 100644 --- a/puppet/services/mistral-event-engine.yaml +++ b/puppet/services/mistral-event-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: ocata +heat_template_version: queens description: > Openstack Mistral Event Engine service configured with Puppet diff --git a/puppet/services/mistral-executor.yaml b/puppet/services/mistral-executor.yaml index 9e8e6c5d85..38a15361ad 100644 --- a/puppet/services/mistral-executor.yaml +++ b/puppet/services/mistral-executor.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 b72ea23d17..92a4b8a6ab 100644 --- a/puppet/services/monitoring/sensu-base.yaml +++ b/puppet/services/monitoring/sensu-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: Sensu base service diff --git a/puppet/services/monitoring/sensu-client.yaml b/puppet/services/monitoring/sensu-client.yaml index a9ffabe524..8f3b4a391f 100644 --- a/puppet/services/monitoring/sensu-client.yaml +++ b/puppet/services/monitoring/sensu-client.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: Sensu client configured with Puppet diff --git a/puppet/services/network/contrail-analytics-database.yaml b/puppet/services/network/contrail-analytics-database.yaml index 414a69cc5e..b2fd1753ef 100644 --- a/puppet/services/network/contrail-analytics-database.yaml +++ b/puppet/services/network/contrail-analytics-database.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Contrail Analytics Database service deployment using puppet, this YAML file diff --git a/puppet/services/network/contrail-analytics.yaml b/puppet/services/network/contrail-analytics.yaml index c60ffcd040..3bbd51f907 100644 --- a/puppet/services/network/contrail-analytics.yaml +++ b/puppet/services/network/contrail-analytics.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Contrail Analytics service deployment using puppet, this YAML file diff --git a/puppet/services/network/contrail-base.yaml b/puppet/services/network/contrail-base.yaml index 77c30bd912..33332359aa 100644 --- a/puppet/services/network/contrail-base.yaml +++ b/puppet/services/network/contrail-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Base parameters for all Contrail Services. diff --git a/puppet/services/network/contrail-config.yaml b/puppet/services/network/contrail-config.yaml index 210c81d713..704973a912 100644 --- a/puppet/services/network/contrail-config.yaml +++ b/puppet/services/network/contrail-config.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Contrail Config service deployment using puppet, this YAML file diff --git a/puppet/services/network/contrail-control.yaml b/puppet/services/network/contrail-control.yaml index 20951b0b8f..cc01362016 100644 --- a/puppet/services/network/contrail-control.yaml +++ b/puppet/services/network/contrail-control.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Contrail Control service deployment using puppet, this YAML file diff --git a/puppet/services/network/contrail-database.yaml b/puppet/services/network/contrail-database.yaml index d6c1192df6..faee07d6f2 100644 --- a/puppet/services/network/contrail-database.yaml +++ b/puppet/services/network/contrail-database.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Contrail Database service deployment using puppet, this YAML file diff --git a/puppet/services/network/contrail-dpdk.yaml b/puppet/services/network/contrail-dpdk.yaml index 65b2a2a157..666d0e44f6 100644 --- a/puppet/services/network/contrail-dpdk.yaml +++ b/puppet/services/network/contrail-dpdk.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Neutron Compute OpenContrail plugin diff --git a/puppet/services/network/contrail-heat.yaml b/puppet/services/network/contrail-heat.yaml index 81a8d86b6f..2d51ed6aa1 100644 --- a/puppet/services/network/contrail-heat.yaml +++ b/puppet/services/network/contrail-heat.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Contrail Heat plugin adds Contrail specific heat resources enabling heat diff --git a/puppet/services/network/contrail-neutron-plugin.yaml b/puppet/services/network/contrail-neutron-plugin.yaml index 50a6be4820..2c56871c44 100644 --- a/puppet/services/network/contrail-neutron-plugin.yaml +++ b/puppet/services/network/contrail-neutron-plugin.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Neutron Opencontrail plugin diff --git a/puppet/services/network/contrail-tsn.yaml b/puppet/services/network/contrail-tsn.yaml index a96551604f..d5a0c4cfe3 100644 --- a/puppet/services/network/contrail-tsn.yaml +++ b/puppet/services/network/contrail-tsn.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Contrail TSN Service diff --git a/puppet/services/network/contrail-vrouter.yaml b/puppet/services/network/contrail-vrouter.yaml index 1773c3671e..7719ba07d4 100644 --- a/puppet/services/network/contrail-vrouter.yaml +++ b/puppet/services/network/contrail-vrouter.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Neutron Compute OpenContrail plugin diff --git a/puppet/services/network/contrail-webui.yaml b/puppet/services/network/contrail-webui.yaml index 8f96643fa7..182267dc9d 100644 --- a/puppet/services/network/contrail-webui.yaml +++ b/puppet/services/network/contrail-webui.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Contrail WebUI service deployment using puppet, this YAML file diff --git a/puppet/services/neutron-api.yaml b/puppet/services/neutron-api.yaml index 459a968ab9..5a1ca2de8c 100644 --- a/puppet/services/neutron-api.yaml +++ b/puppet/services/neutron-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Neutron Server configured with Puppet diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml index f4d8198040..e8515c5389 100644 --- a/puppet/services/neutron-base.yaml +++ b/puppet/services/neutron-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 8279eb2659..d4e5eb685e 100644 --- a/puppet/services/neutron-bgpvpn-api.yaml +++ b/puppet/services/neutron-bgpvpn-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > BGPVPN API service configured with Puppet diff --git a/puppet/services/neutron-bgpvpn-bagpipe.yaml b/puppet/services/neutron-bgpvpn-bagpipe.yaml index 52d776a885..44a8a99a88 100644 --- a/puppet/services/neutron-bgpvpn-bagpipe.yaml +++ b/puppet/services/neutron-bgpvpn-bagpipe.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Bagpipe Driver configured with Puppet diff --git a/puppet/services/neutron-bigswitch-agent.yaml b/puppet/services/neutron-bigswitch-agent.yaml index 029d2e02e7..92ae41e42a 100644 --- a/puppet/services/neutron-bigswitch-agent.yaml +++ b/puppet/services/neutron-bigswitch-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 3f0b84eed8..b9389ff6d5 100644 --- a/puppet/services/neutron-compute-plugin-midonet.yaml +++ b/puppet/services/neutron-compute-plugin-midonet.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 5273d28e52..98398305ff 100644 --- a/puppet/services/neutron-compute-plugin-nuage.yaml +++ b/puppet/services/neutron-compute-plugin-nuage.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 c041891be8..4ae7e503da 100644 --- a/puppet/services/neutron-compute-plugin-plumgrid.yaml +++ b/puppet/services/neutron-compute-plugin-plumgrid.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Neutron Compute Plumgrid plugin diff --git a/puppet/services/neutron-dhcp.yaml b/puppet/services/neutron-dhcp.yaml index 6db847a6a1..f9b421b414 100644 --- a/puppet/services/neutron-dhcp.yaml +++ b/puppet/services/neutron-dhcp.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 833766661e..b64ea296a3 100644 --- a/puppet/services/neutron-l2gw-agent.yaml +++ b/puppet/services/neutron-l2gw-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > L2 Gateway agent configured with Puppet diff --git a/puppet/services/neutron-l2gw-api.yaml b/puppet/services/neutron-l2gw-api.yaml index fdd652663c..4d0f827ca2 100644 --- a/puppet/services/neutron-l2gw-api.yaml +++ b/puppet/services/neutron-l2gw-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 1d45520c07..d526977031 100644 --- a/puppet/services/neutron-l3-compute-dvr.yaml +++ b/puppet/services/neutron-l3-compute-dvr.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 276338189c..5c2d10c005 100644 --- a/puppet/services/neutron-l3.yaml +++ b/puppet/services/neutron-l3.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Neutron L3 agent configured with Puppet diff --git a/puppet/services/neutron-lbaas.yaml b/puppet/services/neutron-lbaas.yaml index a2c1a2aee3..4a51f52b3b 100644 --- a/puppet/services/neutron-lbaas.yaml +++ b/puppet/services/neutron-lbaas.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Neutron LBaaS service configured with Puppet diff --git a/puppet/services/neutron-linuxbridge-agent.yaml b/puppet/services/neutron-linuxbridge-agent.yaml index d6ad3b0035..0fb99631a8 100644 --- a/puppet/services/neutron-linuxbridge-agent.yaml +++ b/puppet/services/neutron-linuxbridge-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Neutron Linuxbridge agent configured with Puppet. diff --git a/puppet/services/neutron-metadata.yaml b/puppet/services/neutron-metadata.yaml index ace5112e6d..4fd1e043e9 100644 --- a/puppet/services/neutron-metadata.yaml +++ b/puppet/services/neutron-metadata.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Neutron Metadata agent configured with Puppet diff --git a/puppet/services/neutron-midonet.yaml b/puppet/services/neutron-midonet.yaml index f7873b9e32..acbb7fb233 100644 --- a/puppet/services/neutron-midonet.yaml +++ b/puppet/services/neutron-midonet.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Neutron Midonet plugin and services diff --git a/puppet/services/neutron-ovs-agent.yaml b/puppet/services/neutron-ovs-agent.yaml index 9f9aa86d55..79e6b3f61c 100644 --- a/puppet/services/neutron-ovs-agent.yaml +++ b/puppet/services/neutron-ovs-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 4f5eecca04..71c4474e3f 100644 --- a/puppet/services/neutron-ovs-dpdk-agent.yaml +++ b/puppet/services/neutron-ovs-dpdk-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Neutron OVS DPDK configured with Puppet for Compute Role diff --git a/puppet/services/neutron-plugin-ml2-fujitsu-cfab.yaml b/puppet/services/neutron-plugin-ml2-fujitsu-cfab.yaml index 3e7250d1af..9063908da7 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: pike +heat_template_version: queens 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 cb7842e2ed..843653590c 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: pike +heat_template_version: queens description: Configure hieradata for Fujitsu fossw plugin configuration diff --git a/puppet/services/neutron-plugin-ml2-nuage.yaml b/puppet/services/neutron-plugin-ml2-nuage.yaml index 4cd541cce1..d7c2214583 100644 --- a/puppet/services/neutron-plugin-ml2-nuage.yaml +++ b/puppet/services/neutron-plugin-ml2-nuage.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 68bba110f0..2207326e57 100644 --- a/puppet/services/neutron-plugin-ml2-odl.yaml +++ b/puppet/services/neutron-plugin-ml2-odl.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 fb6900ee8c..45a2164f88 100644 --- a/puppet/services/neutron-plugin-ml2-ovn.yaml +++ b/puppet/services/neutron-plugin-ml2-ovn.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 b8c31d7e4a..aeb2b25ab5 100644 --- a/puppet/services/neutron-plugin-ml2.yaml +++ b/puppet/services/neutron-plugin-ml2.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 ad0fc7f893..a68551473f 100644 --- a/puppet/services/neutron-plugin-nsx.yaml +++ b/puppet/services/neutron-plugin-nsx.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Neutron NSX diff --git a/puppet/services/neutron-plugin-nuage.yaml b/puppet/services/neutron-plugin-nuage.yaml index 135b18064d..4a4d6515d3 100644 --- a/puppet/services/neutron-plugin-nuage.yaml +++ b/puppet/services/neutron-plugin-nuage.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Neutron Nuage plugin diff --git a/puppet/services/neutron-plugin-plumgrid.yaml b/puppet/services/neutron-plugin-plumgrid.yaml index 71928473a6..c881f60c2d 100644 --- a/puppet/services/neutron-plugin-plumgrid.yaml +++ b/puppet/services/neutron-plugin-plumgrid.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Neutron Plumgrid plugin diff --git a/puppet/services/neutron-sfc-api.yaml b/puppet/services/neutron-sfc-api.yaml index d190ee158b..bd62e4d2c5 100644 --- a/puppet/services/neutron-sfc-api.yaml +++ b/puppet/services/neutron-sfc-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > SFC API service configured with Puppet diff --git a/puppet/services/neutron-sriov-agent.yaml b/puppet/services/neutron-sriov-agent.yaml index 5c52ecfc0b..1790163d44 100644 --- a/puppet/services/neutron-sriov-agent.yaml +++ b/puppet/services/neutron-sriov-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 987b96f953..254bd4bd58 100644 --- a/puppet/services/neutron-sriov-host-config.yaml +++ b/puppet/services/neutron-sriov-host-config.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Neutron SR-IOV host configuration diff --git a/puppet/services/neutron-vpp-agent.yaml b/puppet/services/neutron-vpp-agent.yaml index 803c041bac..f45ab6a8e4 100644 --- a/puppet/services/neutron-vpp-agent.yaml +++ b/puppet/services/neutron-vpp-agent.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Neutron ML2/VPP agent configured with Puppet diff --git a/puppet/services/nova-api.yaml b/puppet/services/nova-api.yaml index 62fb6f0fa8..da26d00817 100644 --- a/puppet/services/nova-api.yaml +++ b/puppet/services/nova-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Nova API service configured with Puppet diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml index adb97e5952..ec9a9c015f 100644 --- a/puppet/services/nova-base.yaml +++ b/puppet/services/nova-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 5326a25023..594d81944b 100644 --- a/puppet/services/nova-compute.yaml +++ b/puppet/services/nova-compute.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Nova Compute service configured with Puppet diff --git a/puppet/services/nova-conductor.yaml b/puppet/services/nova-conductor.yaml index 5abad452b9..7f1e914857 100644 --- a/puppet/services/nova-conductor.yaml +++ b/puppet/services/nova-conductor.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Nova Conductor service configured with Puppet diff --git a/puppet/services/nova-consoleauth.yaml b/puppet/services/nova-consoleauth.yaml index 317dd41bf8..3ec56581d5 100644 --- a/puppet/services/nova-consoleauth.yaml +++ b/puppet/services/nova-consoleauth.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Nova Consoleauth service configured with Puppet diff --git a/puppet/services/nova-ironic.yaml b/puppet/services/nova-ironic.yaml index 5a9f16b34b..44a05bc078 100644 --- a/puppet/services/nova-ironic.yaml +++ b/puppet/services/nova-ironic.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 125241eec6..99327d93de 100644 --- a/puppet/services/nova-libvirt.yaml +++ b/puppet/services/nova-libvirt.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Libvirt service configured with Puppet diff --git a/puppet/services/nova-metadata.yaml b/puppet/services/nova-metadata.yaml index 3ac5f3005d..2b9c809b32 100644 --- a/puppet/services/nova-metadata.yaml +++ b/puppet/services/nova-metadata.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 dcff1fdcb3..04489127fe 100644 --- a/puppet/services/nova-migration-target.yaml +++ b/puppet/services/nova-migration-target.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Nova migration target configured with Puppet diff --git a/puppet/services/nova-placement.yaml b/puppet/services/nova-placement.yaml index e44a7215bb..39ac8254ac 100644 --- a/puppet/services/nova-placement.yaml +++ b/puppet/services/nova-placement.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Nova Placement API service configured with Puppet diff --git a/puppet/services/nova-scheduler.yaml b/puppet/services/nova-scheduler.yaml index e47cb90c48..84b486ebb4 100644 --- a/puppet/services/nova-scheduler.yaml +++ b/puppet/services/nova-scheduler.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 6d599df72b..31c65fbec5 100644 --- a/puppet/services/nova-vnc-proxy.yaml +++ b/puppet/services/nova-vnc-proxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Nova Vncproxy service configured with Puppet diff --git a/puppet/services/octavia-api.yaml b/puppet/services/octavia-api.yaml index 464fc2d098..0a5b1206d7 100644 --- a/puppet/services/octavia-api.yaml +++ b/puppet/services/octavia-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Octavia API service. diff --git a/puppet/services/octavia-base.yaml b/puppet/services/octavia-base.yaml index 83d0fca2d2..b581957633 100644 --- a/puppet/services/octavia-base.yaml +++ b/puppet/services/octavia-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 874e9f5932..c3d1c1db52 100644 --- a/puppet/services/octavia-health-manager.yaml +++ b/puppet/services/octavia-health-manager.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Octavia Health Manager service. diff --git a/puppet/services/octavia-housekeeping.yaml b/puppet/services/octavia-housekeeping.yaml index 79e0e6642b..656ba1bf0f 100644 --- a/puppet/services/octavia-housekeeping.yaml +++ b/puppet/services/octavia-housekeeping.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Octavia Housekeeping service. diff --git a/puppet/services/octavia-worker.yaml b/puppet/services/octavia-worker.yaml index 2cc8a1e800..3449ed704a 100644 --- a/puppet/services/octavia-worker.yaml +++ b/puppet/services/octavia-worker.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Octavia Worker service. diff --git a/puppet/services/opendaylight-api.yaml b/puppet/services/opendaylight-api.yaml index 1feb62b207..3ea1f0cea2 100644 --- a/puppet/services/opendaylight-api.yaml +++ b/puppet/services/opendaylight-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenDaylight SDN Controller. diff --git a/puppet/services/opendaylight-ovs.yaml b/puppet/services/opendaylight-ovs.yaml index c1cec4ff41..7f98df8bff 100644 --- a/puppet/services/opendaylight-ovs.yaml +++ b/puppet/services/opendaylight-ovs.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenDaylight OVS Configuration. diff --git a/puppet/services/openvswitch.yaml b/puppet/services/openvswitch.yaml index 6479d7f9c8..8c375c6e26 100644 --- a/puppet/services/openvswitch.yaml +++ b/puppet/services/openvswitch.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Open vSwitch Configuration diff --git a/puppet/services/ovn-controller.yaml b/puppet/services/ovn-controller.yaml index 65102adcdb..563d9f03b2 100644 --- a/puppet/services/ovn-controller.yaml +++ b/puppet/services/ovn-controller.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack OVN Controller agent diff --git a/puppet/services/ovn-dbs.yaml b/puppet/services/ovn-dbs.yaml index 2b98008b14..7361691b10 100644 --- a/puppet/services/ovn-dbs.yaml +++ b/puppet/services/ovn-dbs.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OVN databases configured with puppet diff --git a/puppet/services/pacemaker.yaml b/puppet/services/pacemaker.yaml index badb1a4e72..2a5a428990 100644 --- a/puppet/services/pacemaker.yaml +++ b/puppet/services/pacemaker.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Pacemaker service configured with Puppet diff --git a/puppet/services/pacemaker/ceph-rbdmirror.yaml b/puppet/services/pacemaker/ceph-rbdmirror.yaml index caf112d154..7b6b898674 100644 --- a/puppet/services/pacemaker/ceph-rbdmirror.yaml +++ b/puppet/services/pacemaker/ceph-rbdmirror.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Ceph RBD mirror service. diff --git a/puppet/services/pacemaker/cinder-backup.yaml b/puppet/services/pacemaker/cinder-backup.yaml index 99c7898704..64758894e4 100644 --- a/puppet/services/pacemaker/cinder-backup.yaml +++ b/puppet/services/pacemaker/cinder-backup.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 cbbf2eaf24..13a8299116 100644 --- a/puppet/services/pacemaker/cinder-volume.yaml +++ b/puppet/services/pacemaker/cinder-volume.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Cinder Volume service with Pacemaker configured with Puppet diff --git a/puppet/services/pacemaker/database/mysql.yaml b/puppet/services/pacemaker/database/mysql.yaml index 2735380934..94d6bcc617 100644 --- a/puppet/services/pacemaker/database/mysql.yaml +++ b/puppet/services/pacemaker/database/mysql.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 e466f30471..06c83dfced 100644 --- a/puppet/services/pacemaker/database/redis.yaml +++ b/puppet/services/pacemaker/database/redis.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Redis service configured with Puppet diff --git a/puppet/services/pacemaker/haproxy.yaml b/puppet/services/pacemaker/haproxy.yaml index 45b2a665e3..2fddca9664 100644 --- a/puppet/services/pacemaker/haproxy.yaml +++ b/puppet/services/pacemaker/haproxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 8a28201462..0e06f185a6 100644 --- a/puppet/services/pacemaker/manila-share.yaml +++ b/puppet/services/pacemaker/manila-share.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 e6394e6c48..71c56a2e95 100644 --- a/puppet/services/pacemaker/ovn-dbs.yaml +++ b/puppet/services/pacemaker/ovn-dbs.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OVN databases configured with puppet in HA mode diff --git a/puppet/services/pacemaker/rabbitmq.yaml b/puppet/services/pacemaker/rabbitmq.yaml index 112149c7a3..e4b1168f28 100644 --- a/puppet/services/pacemaker/rabbitmq.yaml +++ b/puppet/services/pacemaker/rabbitmq.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > RabbitMQ service with Pacemaker configured with Puppet diff --git a/puppet/services/pacemaker_remote.yaml b/puppet/services/pacemaker_remote.yaml index 47ca61426a..c9b5025fd8 100644 --- a/puppet/services/pacemaker_remote.yaml +++ b/puppet/services/pacemaker_remote.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Pacemaker remote service configured with Puppet diff --git a/puppet/services/panko-api.yaml b/puppet/services/panko-api.yaml index 892ad1c185..d9774b1d4a 100644 --- a/puppet/services/panko-api.yaml +++ b/puppet/services/panko-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Panko API service configured with Puppet. diff --git a/puppet/services/panko-base.yaml b/puppet/services/panko-base.yaml index bdc58fa117..1ef04ddf26 100644 --- a/puppet/services/panko-base.yaml +++ b/puppet/services/panko-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Panko service configured with Puppet diff --git a/puppet/services/qdr.yaml b/puppet/services/qdr.yaml index 4cb2df183a..dd78b6fb7d 100644 --- a/puppet/services/qdr.yaml +++ b/puppet/services/qdr.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Qpid dispatch router service configured with Puppet diff --git a/puppet/services/rabbitmq.yaml b/puppet/services/rabbitmq.yaml index 9b0cd34337..47762b1548 100644 --- a/puppet/services/rabbitmq.yaml +++ b/puppet/services/rabbitmq.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > RabbitMQ service configured with Puppet diff --git a/puppet/services/sahara-api.yaml b/puppet/services/sahara-api.yaml index d660fe3168..788c1caf72 100644 --- a/puppet/services/sahara-api.yaml +++ b/puppet/services/sahara-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Sahara API service configured with Puppet diff --git a/puppet/services/sahara-base.yaml b/puppet/services/sahara-base.yaml index 080552dca1..ca7362c94e 100644 --- a/puppet/services/sahara-base.yaml +++ b/puppet/services/sahara-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens 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 b58e3ec254..45858689d4 100644 --- a/puppet/services/sahara-engine.yaml +++ b/puppet/services/sahara-engine.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Sahara Engine service configured with Puppet diff --git a/puppet/services/securetty.yaml b/puppet/services/securetty.yaml index b070d95f83..5f833acd31 100644 --- a/puppet/services/securetty.yaml +++ b/puppet/services/securetty.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Configure securetty values diff --git a/puppet/services/snmp.yaml b/puppet/services/snmp.yaml index 732058b6eb..11f2213ae0 100644 --- a/puppet/services/snmp.yaml +++ b/puppet/services/snmp.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > SNMP client configured with Puppet, to facilitate Ceilometer Hardware diff --git a/puppet/services/sshd.yaml b/puppet/services/sshd.yaml index a98070149d..b8b49da6ba 100644 --- a/puppet/services/sshd.yaml +++ b/puppet/services/sshd.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Configure sshd_config diff --git a/puppet/services/swift-base.yaml b/puppet/services/swift-base.yaml index 8d74c70398..dba2234839 100644 --- a/puppet/services/swift-base.yaml +++ b/puppet/services/swift-base.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Swift Proxy service configured with Puppet diff --git a/puppet/services/swift-dispersion.yaml b/puppet/services/swift-dispersion.yaml index 3d8514a58e..fe5a63f56e 100644 --- a/puppet/services/swift-dispersion.yaml +++ b/puppet/services/swift-dispersion.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Swift dispersion tool configured with Puppet diff --git a/puppet/services/swift-proxy.yaml b/puppet/services/swift-proxy.yaml index 4b00054bd8..68e13d6db1 100644 --- a/puppet/services/swift-proxy.yaml +++ b/puppet/services/swift-proxy.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Swift Proxy service configured with Puppet diff --git a/puppet/services/swift-ringbuilder.yaml b/puppet/services/swift-ringbuilder.yaml index dd4cebb496..21bf0dea6f 100644 --- a/puppet/services/swift-ringbuilder.yaml +++ b/puppet/services/swift-ringbuilder.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Swift Ringbuilder diff --git a/puppet/services/swift-storage.yaml b/puppet/services/swift-storage.yaml index f1fb3d573a..ffffbcb1a4 100644 --- a/puppet/services/swift-storage.yaml +++ b/puppet/services/swift-storage.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Swift Storage service configured with Puppet diff --git a/puppet/services/tacker.yaml b/puppet/services/tacker.yaml index 5614b55a16..9dd8f49c73 100644 --- a/puppet/services/tacker.yaml +++ b/puppet/services/tacker.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > OpenStack Tacker service configured with Puppet diff --git a/puppet/services/time/ntp.yaml b/puppet/services/time/ntp.yaml index 41df19a0b9..2b65793e6a 100644 --- a/puppet/services/time/ntp.yaml +++ b/puppet/services/time/ntp.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > NTP service deployment using puppet, this YAML file diff --git a/puppet/services/time/timezone.yaml b/puppet/services/time/timezone.yaml index f991a6b040..bc939f6933 100644 --- a/puppet/services/time/timezone.yaml +++ b/puppet/services/time/timezone.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Composable Timezone service diff --git a/puppet/services/tripleo-firewall.yaml b/puppet/services/tripleo-firewall.yaml index 18835255f9..4b9b20df60 100644 --- a/puppet/services/tripleo-firewall.yaml +++ b/puppet/services/tripleo-firewall.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > TripleO Firewall settings diff --git a/puppet/services/tripleo-packages.yaml b/puppet/services/tripleo-packages.yaml index 8570d4bc4a..b5c7b15976 100644 --- a/puppet/services/tripleo-packages.yaml +++ b/puppet/services/tripleo-packages.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > TripleO Package installation settings diff --git a/puppet/services/tuned.yaml b/puppet/services/tuned.yaml index cbebaff7cd..2d1b49d28b 100644 --- a/puppet/services/tuned.yaml +++ b/puppet/services/tuned.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Configure tuned diff --git a/puppet/services/veritas-hyperscale-controller.yaml b/puppet/services/veritas-hyperscale-controller.yaml index 33244b352d..7208d59eb0 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: pike +heat_template_version: queens description: > Openstack Veritas HyperScale backend diff --git a/puppet/services/vpp.yaml b/puppet/services/vpp.yaml index fda92b7acd..51890b2459 100644 --- a/puppet/services/vpp.yaml +++ b/puppet/services/vpp.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Vpp service configured with Puppet diff --git a/puppet/services/zaqar-api.yaml b/puppet/services/zaqar-api.yaml index 6cc26fc807..fe40855687 100644 --- a/puppet/services/zaqar-api.yaml +++ b/puppet/services/zaqar-api.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: > Openstack Zaqar service. Shared for all Heat services. diff --git a/puppet/upgrade_config.yaml b/puppet/upgrade_config.yaml index 4f96717508..e9824adcf6 100644 --- a/puppet/upgrade_config.yaml +++ b/puppet/upgrade_config.yaml @@ -1,4 +1,4 @@ -heat_template_version: pike +heat_template_version: queens description: 'Upgrade for via ansible by applying a step related tag' parameters: diff --git a/releasenotes/notes/update-heat-templates-to-queens-dec638e7b34bed09.yaml b/releasenotes/notes/update-heat-templates-to-queens-dec638e7b34bed09.yaml new file mode 100644 index 0000000000..34b6204d3b --- /dev/null +++ b/releasenotes/notes/update-heat-templates-to-queens-dec638e7b34bed09.yaml @@ -0,0 +1,4 @@ +--- +upgrade: + - Upgrade Heat templates version to queens in order to + match Heat requirements. diff --git a/tools/yaml-validate.py b/tools/yaml-validate.py index bc11c3beb5..f5c921baf9 100755 --- a/tools/yaml-validate.py +++ b/tools/yaml-validate.py @@ -20,9 +20,9 @@ import yaml # Only permit the template alias versions # The current template version should be the last element valid_heat_template_versions = [ - 'newton', 'ocata', 'pike', + 'queens', ] current_heat_template_version = valid_heat_template_versions[-1]