Merge pull request #704 from stackhpc/antelope-image-build

Antelope image builds & CI passing

Author: markgoddard

etc/kayobe/docker.yml

@@ -24,6 +24,11 @@
 # URL of docker registry
 docker_registry: "{{ stackhpc_docker_registry }}"
 
+# Whether docker should be configured to use an insecure registry.
+# Default is false, unless docker_registry_enabled is true and
+# docker_registry_enable_tls is false.
+docker_registry_insecure: "{{ 'https' not in stackhpc_repo_mirror_url }}"
+
 # CA of docker registry
 #docker_registry_ca:
 

etc/kayobe/environments/aufn-ceph/kolla/inventory/overcloud-services.j2

@@ -27,10 +27,6 @@ common
 [opensearch:children]
 control
 
-# TODO: This is used for cleanup and can be removed in the Antelope cycle.
-[elasticsearch-curator:children]
-opensearch
-
 # Opensearch dashboards
 [opensearch-dashboards:children]
 opensearch

etc/kayobe/kolla.yml

@@ -81,11 +81,6 @@ kolla_ansible_source_version: "{{ stackhpc_kolla_ansible_source_version }}"
 # Docker namespace to use for Kolla images. Default is 'kolla'.
 kolla_docker_namespace: stackhpc
 
-# Whether docker should be configured to use an insecure registry for Kolla
-# images. Default is false, unless docker_registry_enabled is true and
-# docker_registry_enable_tls is false.
-kolla_docker_registry_insecure: "{{ 'https' not in stackhpc_repo_mirror_url }}"
-
 # Username to use to access a docker registry. Default is not set, in which
 # case the registry will be used without authentication.
 kolla_docker_registry_username: "{{ stackhpc_docker_registry_username }}"
@@ -224,7 +219,7 @@ stackhpc_ubuntu_jammy_repos:
   - "deb {{ stackhpc_repo_ubuntu_jammy_url }} jammy-updates main universe"
   - "deb {{ stackhpc_repo_ubuntu_jammy_url }} jammy-backports main universe"
   - "deb {{ stackhpc_repo_ubuntu_jammy_security_url }} jammy-security main universe"
-  - "deb {{ stackhpc_repo_ubuntu_cloud_archive_url }} jammy-updates/{{ openstack_release }} main"
+  - "deb {{ stackhpc_repo_ubuntu_cloud_archive_url }} jammy-updates/{{ openstack_release_codename }} main"
 
 # Whether to revert to the upstream mirrors in built Kolla container images.
 stackhpc_kolla_clean_up_repo_mirrors: true

etc/kayobe/kolla/globals.yml

@@ -7,18 +7,10 @@ kolla_base_distro: "{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %
 
 kayobe_image_tags:
   openstack:
-    rocky: zed-rocky-9-20230821T155947
-    ubuntu: zed-ubuntu-jammy-20230821T155947
-  bifrost:
-    rocky: zed-rocky-9-20230927T142529
-    ubuntu: zed-ubuntu-jammy-20230927T154443
-  ovn:
-    rocky: zed-rocky-9-20230925T132313
-    ubuntu: zed-ubuntu-jammy-20230821T155947
+    rocky: 2023.1-rocky-9-20231011T200357
+    ubuntu: 2023.1-ubuntu-jammy-20231011T200357
 
 openstack_tag: "{% raw %}{{ kayobe_image_tags['openstack'][kolla_base_distro] }}{% endraw %}"
-bifrost_tag: "{% raw %}{{ kayobe_image_tags['bifrost'][kolla_base_distro] }}{% endraw %}"
-ovn_tag: "{% raw %}{{ kayobe_image_tags['ovn'][kolla_base_distro] }}{% endraw %}"
 
 om_enable_rabbitmq_high_availability: true
 

etc/kayobe/openstack.yml

@@ -5,6 +5,10 @@
 # Name of the current OpenStack release. Default is "2023.1".
 #openstack_release:
 
+# Codename of the current OpenStack release.
+# NOTE(upgrade): Update to current release codename.
+openstack_release_codename: "antelope"
+
 # Name of the current OpenStack branch. Default is "stable/2023.1".
 #openstack_branch:
 

etc/kayobe/pulp-repo-versions.yml

@@ -26,6 +26,6 @@ stackhpc_pulp_repo_rocky_9_2_baseos_version: 20230928T024829
 stackhpc_pulp_repo_rocky_9_2_crb_version: 20230928T024829
 stackhpc_pulp_repo_rocky_9_2_extras_version: 20230915T001040
 stackhpc_pulp_repo_rocky_9_2_highavailability_version: 20230918T015928
-stackhpc_pulp_repo_ubuntu_jammy_security_version: 20230908T053616
-stackhpc_pulp_repo_ubuntu_jammy_version: 20230908T053616
-stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20230908T112533
+stackhpc_pulp_repo_ubuntu_jammy_security_version: 20231009T040332
+stackhpc_pulp_repo_ubuntu_jammy_version: 20231003T083533
+stackhpc_pulp_repo_ubuntu_cloud_archive_version: 20231008T104544

etc/kayobe/pulp.yml

@@ -102,7 +102,7 @@ stackhpc_pulp_deb_repos:
     distribution_name: "ubuntu-cloud-archive-"
     base_path: "ubuntu-cloud-archive/"
     components: "main"
-    distributions: "jammy-updates/{{ openstack_release }}"
+    distributions: "jammy-updates/{{ openstack_release_codename }}"
     required: "{{ stackhpc_pulp_sync_ubuntu_jammy | bool }}"
 
   # Third-party repositories