Add Bobcat release support

.github/workflows/update.yml

@@ -26,7 +26,7 @@ jobs:
       fail-fast: false
       matrix:
         image: ["docker.io/library/debian:11", "docker.io/library/ubuntu:22.04", "docker.io/library/rockylinux:9"]
-        os_release: ["zed", "2023.1"]
+        os_release: ["zed", "2023.1", "2023.2"]
         include:
           - image: "quay.io/centos/centos:stream8"
             os_release: "yoga"

defaults.env

@@ -9,7 +9,7 @@
 ##############################################################################
 
 export OS_ENABLE_LOCAL_REGISTRY="${OS_ENABLE_LOCAL_REGISTRY:-false}"
-export OPENSTACK_RELEASE="${OPENSTACK_RELEASE:-zed}"
+export OPENSTACK_RELEASE="${OPENSTACK_RELEASE:-2023.2}"
 export OS_KOLLA_OPENSTACK_RELEASE="${OPENSTACK_RELEASE}"
 export OS_KOLLA_KOLLA_INSTALL_TYPE="${OS_KOLLA_KOLLA_INSTALL_TYPE:-binary}"
 export OS_KOLLA_KOLLA_BASE_DISTRO="${OS_KOLLA_KOLLA_BASE_DISTRO:-ubuntu}"

install.sh

@@ -144,7 +144,7 @@ if [ "${OS_KOLLA_RUN_INIT:-true}" == "true" ]; then
     sudo chown "$USER:" /etc/kolla/clouds.yaml || :
     # shellcheck disable=SC1091
     source /etc/kolla/admin-openrc.sh
-    curl -fsSL "https://raw.githubusercontent.com/openstack/kolla-ansible/${OS_KOLLA_VERSION:-stable/2023.1}/tools/init-runonce" | bash
+    curl -fsSL "https://raw.githubusercontent.com/openstack/kolla-ansible/${OS_KOLLA_VERSION:-stable/2023.2}/tools/init-runonce" | bash
 
     [ "${OS_KOLLA_ENABLE_MAGNUM:-no}" == "yes" ] && ./scripts/magnum.sh
     [ "${OS_KOLLA_ENABLE_NEUTRON_TRUNK:-yes}" == "yes" ] && ./scripts/neutron_trunk.sh

registry.sh

@@ -22,7 +22,7 @@ trap 'printf "Registry creation process: %s secs\n" "$(($(date +%s)-_start))"' E
 curl -fsSL http://bit.ly/install_pkg | PKG_COMMANDS_LIST="pip,skopeo,docker,jq,git,crudini" bash
 
 if ! command -v kolla-build; then
-    pip install "git+https://github.com/openstack/kolla.git@${OS_KOLLA_VERSION:-stable/2023.1}"
+    pip install "git+https://github.com/openstack/kolla.git@${OS_KOLLA_VERSION:-stable/2023.2}"
     pip install docker-squash
 fi
 
@@ -39,10 +39,10 @@ sudo cp ./etc/kolla/kolla-build.ini /etc/kolla/kolla-build.ini
 source /etc/os-release || source /usr/lib/os-release
 num_cpus=$(lscpu | grep "^CPU(s):" | awk '{ print $2 }')
 
-for kv in "tag=${OPENSTACK_TAG:-"2023.1-${ID,,}-${VERSION_CODENAME:-${VERSION_ID%%.*}}"}" \
+for kv in "tag=${OPENSTACK_TAG:-"2023.2-${ID,,}-${VERSION_CODENAME:-${VERSION_ID%%.*}}"}" \
     "profile=${OS_KOLLA_PROFILE:-custom}" \
     "registry=${DOCKER_REGISTRY_IP:-127.0.0.1}:${DOCKER_REGISTRY_PORT:-5000}" \
-    "openstack_release=${OPENSTACK_RELEASE:-2023.1}" \
+    "openstack_release=${OPENSTACK_RELEASE:-2023.2}" \
     "base=${OS_KOLLA_BASE:-${ID,,}}" \
     "threads=$((num_cpus * 2))" \
     "push_threads=$((num_cpus * 4))"; do
@@ -87,7 +87,7 @@ SNAP=$HOME/.local/ $kolla_cmd | jq "." | tee "$HOME/output.json"
 EONG
 if [[ $(jq '.failed | length ' "$HOME/output.json") != 0 ]]; then
     for image in $(jq -r '.failed[].name' "$HOME/output.json"); do
-        image_name="$image:${OPENSTACK_TAG:-"2023.1-${ID,,}-${VERSION_CODENAME:-${VERSION_ID%%.*}}"}"
+        image_name="$image:${OPENSTACK_TAG:-"2023.2-${ID,,}-${VERSION_CODENAME:-${VERSION_ID%%.*}}"}"
         if [ "$(curl "http://localhost:5000/v2/kolla/${image_name%:*}/tags/list" -o /dev/null -w '%{http_code}\n' -s)" != "200" ] || [ "$(curl "http://localhost:5000/v2/kolla/${image_name%:*}/manifests/${image_name#*:}" -o /dev/null -w '%{http_code}\n' -s)" != "200" ]; then
             local_img_name="${DOCKER_REGISTRY_IP:-127.0.0.1}:${DOCKER_REGISTRY_PORT:-5000}/kolla/$image_name"
             remote_img_name="quay.io/openstack.kolla/$image_name"

releases.txt

@@ -1,3 +1,4 @@
+2023.2
 2023.1
 zed
 yoga

requirements/2023.2/base.in

@@ -0,0 +1,3 @@
+ansible>=6,<8 # GPLv3
+ansible-core>2.14,<2.16 # GPLv3
+kolla-ansible<18.0 # Apache-2.0

requirements/2023.2/debian_11.in

@@ -0,0 +1 @@
+base.in

requirements/2023.2/debian_11.txt

@@ -0,0 +1,96 @@
+#
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
+#
+#    pip-compile --output-file=requirements/2023.1/debian_11.txt requirements/2023.1/debian_11.in
+#
+ansible==6.0.0
+    # via -r requirements/2023.1/debian_11.in
+ansible-core==2.13.0
+    # via
+    #   -r requirements/2023.1/debian_11.in
+    #   ansible
+certifi==2023.7.22
+    # via requests
+cffi==1.15.1
+    # via cryptography
+charset-normalizer==3.2.0
+    # via requests
+cryptography==41.0.2
+    # via
+    #   ansible-core
+    #   kolla-ansible
+debtcollector==2.5.0
+    # via
+    #   oslo-config
+    #   oslo-utils
+hvac==1.1.1
+    # via kolla-ansible
+idna==3.4
+    # via requests
+iso8601==2.0.0
+    # via oslo-utils
+jinja2==3.1.2
+    # via
+    #   ansible-core
+    #   kolla-ansible
+jmespath==1.0.1
+    # via kolla-ansible
+kolla-ansible==16.1.0
+    # via -r requirements/2023.1/debian_11.in
+markupsafe==2.1.3
+    # via jinja2
+mitogen==0.3.4
+    # via -r requirements/2023.1/debian_11.in
+netaddr==0.8.0
+    # via
+    #   oslo-config
+    #   oslo-utils
+netifaces==0.11.0
+    # via oslo-utils
+oslo-config==9.1.1
+    # via kolla-ansible
+oslo-i18n==6.0.0
+    # via
+    #   oslo-config
+    #   oslo-utils
+oslo-utils==6.2.0
+    # via kolla-ansible
+packaging==23.1
+    # via
+    #   ansible-core
+    #   oslo-utils
+pbr==5.11.1
+    # via
+    #   kolla-ansible
+    #   oslo-i18n
+    #   stevedore
+pycparser==2.21
+    # via cffi
+pyhcl==0.4.4
+    # via hvac
+pyparsing==3.1.0
+    # via oslo-utils
+pytz==2023.3
+    # via oslo-utils
+pyyaml==6.0.1
+    # via
+    #   ansible-core
+    #   kolla-ansible
+    #   oslo-config
+requests==2.31.0
+    # via
+    #   hvac
+    #   oslo-config
+resolvelib==0.5.4
+    # via ansible-core
+rfc3986==2.0.0
+    # via oslo-config
+stevedore==5.1.0
+    # via oslo-config
+tzdata==2023.3
+    # via oslo-utils
+urllib3==2.0.4
+    # via requests
+wrapt==1.15.0
+    # via debtcollector

requirements/2023.2/rocky_9.in

@@ -0,0 +1 @@
+base.in

requirements/2023.2/rocky_9.txt

@@ -0,0 +1,96 @@
+#
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
+#
+#    pip-compile --output-file=requirements/2023.1/rocky_9.txt requirements/2023.1/rocky_9.in
+#
+ansible==6.0.0
+    # via -r requirements/2023.1/rocky_9.in
+ansible-core==2.13.0
+    # via
+    #   -r requirements/2023.1/rocky_9.in
+    #   ansible
+certifi==2023.7.22
+    # via requests
+cffi==1.15.1
+    # via cryptography
+charset-normalizer==3.2.0
+    # via requests
+cryptography==41.0.2
+    # via
+    #   ansible-core
+    #   kolla-ansible
+debtcollector==2.5.0
+    # via
+    #   oslo-config
+    #   oslo-utils
+hvac==1.1.1
+    # via kolla-ansible
+idna==3.4
+    # via requests
+iso8601==2.0.0
+    # via oslo-utils
+jinja2==3.1.2
+    # via
+    #   ansible-core
+    #   kolla-ansible
+jmespath==1.0.1
+    # via kolla-ansible
+kolla-ansible==16.1.0
+    # via -r requirements/2023.1/rocky_9.in
+markupsafe==2.1.3
+    # via jinja2
+mitogen==0.3.4
+    # via -r requirements/2023.1/rocky_9.in
+netaddr==0.8.0
+    # via
+    #   oslo-config
+    #   oslo-utils
+netifaces==0.11.0
+    # via oslo-utils
+oslo-config==9.1.1
+    # via kolla-ansible
+oslo-i18n==6.0.0
+    # via
+    #   oslo-config
+    #   oslo-utils
+oslo-utils==6.2.0
+    # via kolla-ansible
+packaging==23.1
+    # via
+    #   ansible-core
+    #   oslo-utils
+pbr==5.11.1
+    # via
+    #   kolla-ansible
+    #   oslo-i18n
+    #   stevedore
+pycparser==2.21
+    # via cffi
+pyhcl==0.4.4
+    # via hvac
+pyparsing==3.1.0
+    # via oslo-utils
+pytz==2023.3
+    # via oslo-utils
+pyyaml==6.0.1
+    # via
+    #   ansible-core
+    #   kolla-ansible
+    #   oslo-config
+requests==2.31.0
+    # via
+    #   hvac
+    #   oslo-config
+resolvelib==0.5.4
+    # via ansible-core
+rfc3986==2.0.0
+    # via oslo-config
+stevedore==5.1.0
+    # via oslo-config
+tzdata==2023.3
+    # via oslo-utils
+urllib3==2.0.4
+    # via requests
+wrapt==1.15.0
+    # via debtcollector

requirements/2023.2/ubuntu_22.in

@@ -0,0 +1 @@
+base.in

requirements/2023.2/ubuntu_22.txt

@@ -0,0 +1,101 @@
+#
+# This file is autogenerated by pip-compile with Python 3.10
+# by the following command:
+#
+#    pip-compile --output-file=requirements/2023.2/ubuntu_22.txt requirements/2023.2/ubuntu_22.in
+#
+ansible==7.7.0
+    # via -r requirements/2023.2/ubuntu_22.in
+ansible-core==2.14.13
+    # via
+    #   -r requirements/2023.2/ubuntu_22.in
+    #   ansible
+bcrypt==4.1.1
+    # via
+    #   kolla-ansible
+    #   passlib
+certifi==2023.11.17
+    # via requests
+cffi==1.16.0
+    # via cryptography
+charset-normalizer==3.3.2
+    # via requests
+cryptography==41.0.7
+    # via
+    #   ansible-core
+    #   kolla-ansible
+debtcollector==2.5.0
+    # via
+    #   oslo-config
+    #   oslo-utils
+hvac==2.0.0
+    # via kolla-ansible
+idna==3.6
+    # via requests
+iso8601==2.1.0
+    # via oslo-utils
+jinja2==3.1.2
+    # via
+    #   ansible-core
+    #   kolla-ansible
+jmespath==1.0.1
+    # via kolla-ansible
+kolla-ansible==17.0.0
+    # via -r requirements/2023.2/ubuntu_22.in
+markupsafe==2.1.3
+    # via jinja2
+netaddr==0.9.0
+    # via
+    #   oslo-config
+    #   oslo-utils
+netifaces==0.11.0
+    # via oslo-utils
+oslo-config==9.2.0
+    # via kolla-ansible
+oslo-i18n==6.2.0
+    # via
+    #   oslo-config
+    #   oslo-utils
+oslo-utils==6.3.0
+    # via kolla-ansible
+packaging==23.2
+    # via
+    #   ansible-core
+    #   oslo-utils
+passlib[bcrypt]==1.7.4
+    # via
+    #   kolla-ansible
+    #   passlib
+pbr==6.0.0
+    # via
+    #   kolla-ansible
+    #   oslo-i18n
+    #   stevedore
+pycparser==2.21
+    # via cffi
+pyparsing==3.1.1
+    # via oslo-utils
+pytz==2023.3.post1
+    # via oslo-utils
+pyyaml==6.0.1
+    # via
+    #   ansible-core
+    #   kolla-ansible
+    #   oslo-config
+    #   oslo-utils
+requests==2.31.0
+    # via
+    #   hvac
+    #   oslo-config
+resolvelib==0.8.1
+    # via ansible-core
+rfc3986==2.0.0
+    # via oslo-config
+stevedore==5.1.0
+    # via oslo-config
+tzdata==2023.3
+    # via oslo-utils
+urllib3==2.1.0
+    # via requests
+wrapt==1.16.0
+    # via debtcollector