Merge branch 'stackhpc/2023.1' into merge-stackhpc-2023.1

Change-Id: I7d407b474d56a1a365bb73634ce87a2d175722b6

.gitreview

@@ -2,4 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/kayobe.git
-defaultbranch=stable/2023.1
+defaultbranch=unmaintained/2023.1

ansible/inventory/group_vars/all/openstack

@@ -5,9 +5,9 @@
 # Name of the current OpenStack release. Default is "2023.1".
 openstack_release: "2023.1"
 
-# Name of the current OpenStack branch. Default is "stable/2023.1".
+# Name of the current OpenStack branch. Default is "unmaintained/2023.1".
 openstack_branch: >-
-  {% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }}
+  {% if openstack_release != 'master' %}unmaintained/{% endif %}{{ openstack_release | lower }}
 
 ###############################################################################
 # OpenStack authentication configuration.

ansible/roles/kolla-ansible/templates/overcloud-components.j2

@@ -203,3 +203,6 @@ monitoring
 
 [caso:children]
 monitoring
+
+[letsencrypt:children]
+loadbalancer

ansible/roles/kolla-ansible/templates/overcloud-services.j2

@@ -568,3 +568,9 @@ venus
 
 [venus-manager:children]
 venus
+
+[letsencrypt-webserver:children]
+letsencrypt
+
+[letsencrypt-lego:children]
+letsencrypt

ansible/roles/kolla-ansible/vars/main.yml

@@ -153,6 +153,7 @@ kolla_feature_flags:
   - keystone_federation
   - keystone_horizon_policy_file
   - kuryr
+  - letsencrypt
   - loadbalancer
   - magnum
   - manila

etc/kayobe/kolla.yml

@@ -351,6 +351,7 @@
 #kolla_enable_keystone_federation:
 #kolla_enable_keystone_horizon_policy_file:
 #kolla_enable_kuryr:
+#kolla_enable_letsencrypt:
 #kolla_enable_loadbalancer:
 #kolla_enable_magnum:
 #kolla_enable_manila:

etc/kayobe/openstack.yml

@@ -5,7 +5,7 @@
 # Name of the current OpenStack release. Default is "2023.1".
 #openstack_release:
 
-# Name of the current OpenStack branch. Default is "stable/2023.1".
+# Name of the current OpenStack branch. Default is "unmaintained/2023.1".
 #openstack_branch:
 
 ###############################################################################

playbooks/kayobe-overcloud-host-configure-base/tests/test_overcloud_host_configure.py

@@ -153,13 +153,13 @@ def test_docker_storage_driver_is_devicemapper(host):
 @pytest.mark.parametrize('user', ['kolla', 'stack'])
 def test_docker_image_download(host, user):
     with host.sudo(user):
-        host.check_output("docker pull alpine")
+        host.check_output("docker pull quay.io/podman/hello")
 
 
 @pytest.mark.parametrize('user', ['kolla', 'stack'])
 def test_docker_container_run(host, user):
     with host.sudo(user):
-        host.check_output("docker run --rm alpine /bin/true")
+        host.check_output("docker run --rm quay.io/podman/hello")
 
 
 def test_timezone(host):

requirements.yml

@@ -2,7 +2,7 @@
 collections:
   - name: https://opendev.org/openstack/ansible-collection-kolla
     type: git
-    version: stable/2023.1
+    version: unmaintained/2023.1
   - name: dellemc.os10
     version: 1.1.1
   - name: stackhpc.linux

zuul.d/jobs.yaml

@@ -71,19 +71,11 @@
     required-projects:
       # Include kayobe to ensure other projects can use this job.
       - name: openstack/ansible-collection-kolla
-        # TODO(mattcrees): Remove when kayobe stable/2023.1 exists.
-        override-checkout: stable/2023.1
       - name: openstack/kayobe
       - name: openstack/kayobe-config-dev
       - name: openstack/kolla
-        # TODO(mattcrees): Remove when kayobe stable/2023.1 exists.
-        override-checkout: stable/2023.1
       - name: openstack/kolla-ansible
-        # TODO(mattcrees): Remove when kayobe stable/2023.1 exists.
-        override-checkout: stable/2023.1
       - name: openstack/requirements
-        # TODO(mattcrees): Remove when kayobe stable/2023.1 exists.
-        override-checkout: stable/2023.1
       - name: openstack/tenks
     irrelevant-files:
       - ^\..+