Merge "Add tls upgrade jobs"

tests/roles/bootstrap-host/templates/user_variables_tls.yml.j2

@@ -10,7 +10,31 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# UPGRADE_TARGET_BRANCH variable is defined only during upgrade scenario
+# when source version is being deployed.
+{% if lookup('env', 'UPGRADE_TARGET_BRANCH') == '' %}
+# Make sure that TLS is fully enabled on target release.
+openstack_service_publicuri_proto: https
 openstack_service_adminuri_proto: https
 openstack_service_internaluri_proto: https
-haproxy_ssl_all_vips: true
+haproxy_ssl: True
+haproxy_ssl_all_vips: True
+rabbitmq_management_ssl: True
 openstack_service_backend_ssl: True
+openstack_service_accept_both_protocols: True
+# Keep keystone proto set to 'http'. This way we can ensure that
+# `openstack_service_accept_both_protocols` works as expected.
+keystone_service_publicuri_proto: http
+keystone_service_adminuri_proto: http
+keystone_service_internaluri_proto: http
+{% else %}
+# Make sure that source release has TLS fully disabled.
+openstack_service_publicuri_proto: http
+openstack_service_adminuri_proto: http
+openstack_service_internaluri_proto: http
+haproxy_ssl: False
+haproxy_ssl_all_vips: False
+rabbitmq_management_ssl: False
+openstack_service_backend_ssl: False
+openstack_service_accept_both_protocols: False
+{% endif %}

zuul.d/jobs.yaml

@@ -431,6 +431,12 @@
     parent: openstack-ansible-deploy-aio
     nodeset: ubuntu-jammy
 
+- job:
+    name: openstack-ansible-upgrade-aio_metal_tls-ubuntu-jammy
+    parent: openstack-ansible-deploy-aio
+    nodeset: ubuntu-jammy
+    timeout: 10800
+
 - job:
     name: openstack-ansible-upgrade-aio_lxc-ubuntu-jammy
     parent: openstack-ansible-deploy-aio
@@ -741,6 +747,12 @@
     parent: openstack-ansible-deploy-aio
     nodeset: rockylinux-9
 
+- job:
+    name: openstack-ansible-upgrade-aio_metal_tls-rockylinux-9
+    parent: openstack-ansible-deploy-aio
+    nodeset: rockylinux-9
+    timeout: 10800
+
 - job:
     name: openstack-ansible-deploy-aio_telemetry_metal-rockylinux-9
     parent: openstack-ansible-deploy-aio

zuul.d/project-templates.yaml

@@ -167,6 +167,9 @@
         - openstack-ansible-deploy-aio_metal_tls-ubuntu-jammy
         - openstack-ansible-upgrade-aio_metal-rockylinux-9
         - openstack-ansible-upgrade-aio_metal-ubuntu-jammy
+        - openstack-ansible-upgrade-aio_metal_tls-rockylinux-9
+        - openstack-ansible-upgrade-aio_metal_tls-ubuntu-jammy
+
     gate:
       jobs:
         - openstack-ansible-deploy-aio_metal-debian-bullseye