diff --git a/.github/workflows/update.yml b/.github/workflows/update.yml index 2250a1e65..2631ffda4 100644 --- a/.github/workflows/update.yml +++ b/.github/workflows/update.yml @@ -27,14 +27,7 @@ jobs: "docker.io/library/ubuntu:22.04", "docker.io/library/rockylinux:9", ] - os_release: ["zed", "2023.1", "2023.2", "2024.1"] - include: - - image: "quay.io/centos/centos:stream8" - os_release: "yoga" - - image: "docker.io/library/debian:11" - os_release: "yoga" - - image: "docker.io/library/ubuntu:20.04" - os_release: "yoga" + os_release: ["2023.1", "2023.2", "2024.1"] container: image: ${{ matrix.image }} runs-on: ubuntu-latest diff --git a/ci/update_distros.sh b/ci/update_distros.sh index f3810c85c..a62d6b928 100755 --- a/ci/update_distros.sh +++ b/ci/update_distros.sh @@ -92,8 +92,6 @@ cat <.distros_supported.yml EOT _vagrant_pull "rocky_9" "rockylinux/9" "rocky-linux-cloud" "rocky-linux-9" -_vagrant_pull "centos_8" "centos/stream8" "centos-cloud" "centos-stream-8" "IDE" -_vagrant_pull "ubuntu_20" "generic/ubuntu2004" "ubuntu-os-cloud" "ubuntu-2004-lts" _vagrant_pull "ubuntu_22" "generic/ubuntu2204" "ubuntu-os-cloud" "ubuntu-2204-lts" _vagrant_pull "debian_11" "debian/bullseye64" "debian-cloud" "debian-11" "SATA Controller" diff --git a/distros_supported.yml b/distros_supported.yml index 8dcddab33..04e9d3901 100644 --- a/distros_supported.yml +++ b/distros_supported.yml @@ -14,18 +14,6 @@ rocky_9: version: "4.0.0" project_id: rocky-linux-cloud family: rocky-linux-9 -centos_8: - name: centos/stream8 - vb_controller: IDE - version: "20210210.0" - project_id: centos-cloud - family: centos-stream-8 -ubuntu_20: - name: generic/ubuntu2004 - vb_controller: IDE Controller - version: "4.3.12" - project_id: ubuntu-os-cloud - family: ubuntu-2004-lts ubuntu_22: name: generic/ubuntu2204 vb_controller: IDE Controller diff --git a/requirements/yoga/base.in b/requirements/yoga/base.in deleted file mode 100644 index c2d47a623..000000000 --- a/requirements/yoga/base.in +++ /dev/null @@ -1,3 +0,0 @@ -ansible>=4,<6 # GPLv3 -kolla-ansible<15.0 # Apache-2.0 -mitogen # BSD diff --git a/requirements/yoga/centos_8.in b/requirements/yoga/centos_8.in deleted file mode 120000 index ee1bbd327..000000000 --- a/requirements/yoga/centos_8.in +++ /dev/null @@ -1 +0,0 @@ -base.in \ No newline at end of file diff --git a/requirements/yoga/centos_8.txt b/requirements/yoga/centos_8.txt deleted file mode 100644 index 32598d6f7..000000000 --- a/requirements/yoga/centos_8.txt +++ /dev/null @@ -1,108 +0,0 @@ -# -# This file is autogenerated by pip-compile with python 3.6 -# To update, run: -# -# pip-compile --output-file=requirements/yoga/centos_8.txt requirements/yoga/centos_8.in -# -ansible==4.10.0 - # via -r requirements/yoga/centos_8.in -ansible-core==2.11.12 - # via ansible -certifi==2024.6.2 - # via requests -cffi==1.15.1 - # via cryptography -charset-normalizer==2.0.12 - # via requests -cryptography==40.0.2 - # via - # ansible-core - # kolla-ansible -debtcollector==2.5.0 - # via - # oslo.config - # oslo.utils -hvac==1.2.1 - # via kolla-ansible -idna==3.7 - # via requests -importlib-metadata==4.8.3 - # via - # debtcollector - # oslo.config - # stevedore -importlib-resources==5.4.0 - # via netaddr -iso8601==1.1.0 - # via oslo.utils -jinja2==3.0.3 - # via - # ansible-core - # kolla-ansible -jmespath==0.10.0 - # via kolla-ansible -kolla-ansible==14.11.0 - # via -r requirements/yoga/centos_8.in -markupsafe==2.0.1 - # via jinja2 -mitogen==0.3.7 - # via -r requirements/yoga/centos_8.in -netaddr==0.10.1 - # via - # oslo.config - # oslo.utils -netifaces==0.11.0 - # via oslo.utils -oslo.config==8.8.1 - # via kolla-ansible -oslo.i18n==5.1.0 - # via - # oslo.config - # oslo.utils -oslo.utils==4.13.0 - # via kolla-ansible -packaging==21.3 - # via - # ansible-core - # oslo.utils -pbr==6.0.0 - # via - # kolla-ansible - # oslo.i18n - # oslo.utils - # stevedore -pycparser==2.21 - # via cffi -pyhcl==0.4.5 - # via hvac -pyparsing==3.1.2 - # via - # oslo.utils - # packaging -pytz==2024.1 - # via oslo.utils -pyyaml==6.0.1 - # via - # ansible-core - # kolla-ansible - # oslo.config -requests==2.27.1 - # via - # hvac - # oslo.config -resolvelib==0.5.4 - # via ansible-core -rfc3986==1.5.0 - # via oslo.config -stevedore==3.5.2 - # via oslo.config -typing-extensions==4.1.1 - # via importlib-metadata -urllib3==1.26.18 - # via requests -wrapt==1.16.0 - # via debtcollector -zipp==3.6.0 - # via - # importlib-metadata - # importlib-resources diff --git a/requirements/yoga/debian_11.in b/requirements/yoga/debian_11.in deleted file mode 120000 index ee1bbd327..000000000 --- a/requirements/yoga/debian_11.in +++ /dev/null @@ -1 +0,0 @@ -base.in \ No newline at end of file diff --git a/requirements/yoga/debian_11.txt b/requirements/yoga/debian_11.txt deleted file mode 100644 index 67e456414..000000000 --- a/requirements/yoga/debian_11.txt +++ /dev/null @@ -1,91 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile --output-file=requirements/yoga/debian_11.txt requirements/yoga/debian_11.in -# -ansible==5.10.0 - # via -r requirements/yoga/debian_11.in -ansible-core==2.12.10 - # via ansible -certifi==2024.7.4 - # via requests -cffi==1.17.0 - # via cryptography -charset-normalizer==3.3.2 - # via requests -cryptography==43.0.0 - # via - # ansible-core - # kolla-ansible -debtcollector==3.0.0 - # via - # oslo-config - # oslo-utils -hvac==2.3.0 - # via kolla-ansible -idna==3.7 - # via requests -iso8601==2.1.0 - # via oslo-utils -jinja2==3.1.4 - # via - # ansible-core - # kolla-ansible -jmespath==1.0.1 - # via kolla-ansible -kolla-ansible==14.11.0 - # via -r requirements/yoga/debian_11.in -markupsafe==2.1.5 - # via jinja2 -mitogen==0.3.9 - # via -r requirements/yoga/debian_11.in -netaddr==1.3.0 - # via - # oslo-config - # oslo-utils -netifaces==0.11.0 - # via oslo-utils -oslo-config==9.5.0 - # via kolla-ansible -oslo-i18n==6.3.0 - # via - # oslo-config - # oslo-utils -oslo-utils==7.2.0 - # via kolla-ansible -packaging==24.1 - # via - # ansible-core - # oslo-utils -pbr==6.0.0 - # via - # kolla-ansible - # oslo-i18n - # stevedore -pycparser==2.22 - # via cffi -pyparsing==3.1.2 - # via oslo-utils -pyyaml==6.0.2 - # via - # ansible-core - # kolla-ansible - # oslo-config - # oslo-utils -requests==2.32.3 - # via - # hvac - # oslo-config -resolvelib==0.5.4 - # via ansible-core -rfc3986==2.0.0 - # via oslo-config -stevedore==5.2.0 - # via oslo-config -tzdata==2024.1 - # via oslo-utils -urllib3==2.2.2 - # via requests -wrapt==1.16.0 - # via debtcollector diff --git a/requirements/yoga/ubuntu_20.in b/requirements/yoga/ubuntu_20.in deleted file mode 120000 index ee1bbd327..000000000 --- a/requirements/yoga/ubuntu_20.in +++ /dev/null @@ -1 +0,0 @@ -base.in \ No newline at end of file diff --git a/requirements/yoga/ubuntu_20.txt b/requirements/yoga/ubuntu_20.txt deleted file mode 100644 index 23411a0f0..000000000 --- a/requirements/yoga/ubuntu_20.txt +++ /dev/null @@ -1,91 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.8 -# by the following command: -# -# pip-compile --output-file=requirements/yoga/ubuntu_20.txt requirements/yoga/ubuntu_20.in -# -ansible==5.10.0 - # via -r requirements/yoga/ubuntu_20.in -ansible-core==2.12.10 - # via ansible -certifi==2024.7.4 - # via requests -cffi==1.17.0 - # via cryptography -charset-normalizer==3.3.2 - # via requests -cryptography==43.0.0 - # via - # ansible-core - # kolla-ansible -debtcollector==3.0.0 - # via - # oslo-config - # oslo-utils -hvac==2.3.0 - # via kolla-ansible -idna==3.7 - # via requests -iso8601==2.1.0 - # via oslo-utils -jinja2==3.1.4 - # via - # ansible-core - # kolla-ansible -jmespath==1.0.1 - # via kolla-ansible -kolla-ansible==14.11.0 - # via -r requirements/yoga/ubuntu_20.in -markupsafe==2.1.5 - # via jinja2 -mitogen==0.3.9 - # via -r requirements/yoga/ubuntu_20.in -netaddr==1.3.0 - # via - # oslo-config - # oslo-utils -netifaces==0.11.0 - # via oslo-utils -oslo-config==9.5.0 - # via kolla-ansible -oslo-i18n==6.3.0 - # via - # oslo-config - # oslo-utils -oslo-utils==7.2.0 - # via kolla-ansible -packaging==24.1 - # via - # ansible-core - # oslo-utils -pbr==6.0.0 - # via - # kolla-ansible - # oslo-i18n - # stevedore -pycparser==2.22 - # via cffi -pyparsing==3.1.2 - # via oslo-utils -pytz==2024.1 - # via oslo-utils -pyyaml==6.0.2 - # via - # ansible-core - # kolla-ansible - # oslo-config - # oslo-utils -requests==2.32.3 - # via - # hvac - # oslo-config -resolvelib==0.5.4 - # via ansible-core -rfc3986==2.0.0 - # via oslo-config -stevedore==5.2.0 - # via oslo-config -urllib3==2.2.2 - # via requests -wrapt==1.16.0 - # via debtcollector diff --git a/requirements/zed/base.in b/requirements/zed/base.in deleted file mode 100644 index 49b9a6353..000000000 --- a/requirements/zed/base.in +++ /dev/null @@ -1,3 +0,0 @@ -ansible>=4,<6 # GPLv3 -kolla-ansible<16.0 # Apache-2.0 -mitogen # BSD diff --git a/requirements/zed/debian_11.in b/requirements/zed/debian_11.in deleted file mode 120000 index ee1bbd327..000000000 --- a/requirements/zed/debian_11.in +++ /dev/null @@ -1 +0,0 @@ -base.in \ No newline at end of file diff --git a/requirements/zed/debian_11.txt b/requirements/zed/debian_11.txt deleted file mode 100644 index 764e58b60..000000000 --- a/requirements/zed/debian_11.txt +++ /dev/null @@ -1,91 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile --output-file=requirements/zed/debian_11.txt requirements/zed/debian_11.in -# -ansible==5.10.0 - # via -r requirements/zed/debian_11.in -ansible-core==2.12.10 - # via ansible -certifi==2024.7.4 - # via requests -cffi==1.17.0 - # via cryptography -charset-normalizer==3.3.2 - # via requests -cryptography==43.0.0 - # via - # ansible-core - # kolla-ansible -debtcollector==3.0.0 - # via - # oslo-config - # oslo-utils -hvac==2.3.0 - # via kolla-ansible -idna==3.7 - # via requests -iso8601==2.1.0 - # via oslo-utils -jinja2==3.1.4 - # via - # ansible-core - # kolla-ansible -jmespath==1.0.1 - # via kolla-ansible -kolla-ansible==15.6.0 - # via -r requirements/zed/debian_11.in -markupsafe==2.1.5 - # via jinja2 -mitogen==0.3.9 - # via -r requirements/zed/debian_11.in -netaddr==1.3.0 - # via - # oslo-config - # oslo-utils -netifaces==0.11.0 - # via oslo-utils -oslo-config==9.5.0 - # via kolla-ansible -oslo-i18n==6.3.0 - # via - # oslo-config - # oslo-utils -oslo-utils==7.2.0 - # via kolla-ansible -packaging==24.1 - # via - # ansible-core - # oslo-utils -pbr==6.0.0 - # via - # kolla-ansible - # oslo-i18n - # stevedore -pycparser==2.22 - # via cffi -pyparsing==3.1.2 - # via oslo-utils -pyyaml==6.0.2 - # via - # ansible-core - # kolla-ansible - # oslo-config - # oslo-utils -requests==2.32.3 - # via - # hvac - # oslo-config -resolvelib==0.5.4 - # via ansible-core -rfc3986==2.0.0 - # via oslo-config -stevedore==5.2.0 - # via oslo-config -tzdata==2024.1 - # via oslo-utils -urllib3==2.2.2 - # via requests -wrapt==1.16.0 - # via debtcollector diff --git a/requirements/zed/rocky_9.in b/requirements/zed/rocky_9.in deleted file mode 120000 index ee1bbd327..000000000 --- a/requirements/zed/rocky_9.in +++ /dev/null @@ -1 +0,0 @@ -base.in \ No newline at end of file diff --git a/requirements/zed/rocky_9.txt b/requirements/zed/rocky_9.txt deleted file mode 100644 index e73065151..000000000 --- a/requirements/zed/rocky_9.txt +++ /dev/null @@ -1,91 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.9 -# by the following command: -# -# pip-compile --output-file=requirements/zed/rocky_9.txt requirements/zed/rocky_9.in -# -ansible==5.10.0 - # via -r requirements/zed/rocky_9.in -ansible-core==2.12.10 - # via ansible -certifi==2024.7.4 - # via requests -cffi==1.17.0 - # via cryptography -charset-normalizer==3.3.2 - # via requests -cryptography==43.0.0 - # via - # ansible-core - # kolla-ansible -debtcollector==3.0.0 - # via - # oslo-config - # oslo-utils -hvac==2.3.0 - # via kolla-ansible -idna==3.7 - # via requests -iso8601==2.1.0 - # via oslo-utils -jinja2==3.1.4 - # via - # ansible-core - # kolla-ansible -jmespath==1.0.1 - # via kolla-ansible -kolla-ansible==15.6.0 - # via -r requirements/zed/rocky_9.in -markupsafe==2.1.5 - # via jinja2 -mitogen==0.3.9 - # via -r requirements/zed/rocky_9.in -netaddr==1.3.0 - # via - # oslo-config - # oslo-utils -netifaces==0.11.0 - # via oslo-utils -oslo-config==9.5.0 - # via kolla-ansible -oslo-i18n==6.3.0 - # via - # oslo-config - # oslo-utils -oslo-utils==7.2.0 - # via kolla-ansible -packaging==24.1 - # via - # ansible-core - # oslo-utils -pbr==6.0.0 - # via - # kolla-ansible - # oslo-i18n - # stevedore -pycparser==2.22 - # via cffi -pyparsing==3.1.2 - # via oslo-utils -pyyaml==6.0.2 - # via - # ansible-core - # kolla-ansible - # oslo-config - # oslo-utils -requests==2.32.3 - # via - # hvac - # oslo-config -resolvelib==0.5.4 - # via ansible-core -rfc3986==2.0.0 - # via oslo-config -stevedore==5.2.0 - # via oslo-config -tzdata==2024.1 - # via oslo-utils -urllib3==2.2.2 - # via requests -wrapt==1.16.0 - # via debtcollector diff --git a/requirements/zed/ubuntu_22.in b/requirements/zed/ubuntu_22.in deleted file mode 120000 index ee1bbd327..000000000 --- a/requirements/zed/ubuntu_22.in +++ /dev/null @@ -1 +0,0 @@ -base.in \ No newline at end of file diff --git a/requirements/zed/ubuntu_22.txt b/requirements/zed/ubuntu_22.txt deleted file mode 100644 index 4f0a33009..000000000 --- a/requirements/zed/ubuntu_22.txt +++ /dev/null @@ -1,91 +0,0 @@ -# -# This file is autogenerated by pip-compile with Python 3.10 -# by the following command: -# -# pip-compile --output-file=requirements/zed/ubuntu_22.txt requirements/zed/ubuntu_22.in -# -ansible==5.10.0 - # via -r requirements/zed/ubuntu_22.in -ansible-core==2.12.10 - # via ansible -certifi==2024.7.4 - # via requests -cffi==1.17.0 - # via cryptography -charset-normalizer==3.3.2 - # via requests -cryptography==43.0.0 - # via - # ansible-core - # kolla-ansible -debtcollector==3.0.0 - # via - # oslo-config - # oslo-utils -hvac==2.3.0 - # via kolla-ansible -idna==3.7 - # via requests -iso8601==2.1.0 - # via oslo-utils -jinja2==3.1.4 - # via - # ansible-core - # kolla-ansible -jmespath==1.0.1 - # via kolla-ansible -kolla-ansible==15.6.0 - # via -r requirements/zed/ubuntu_22.in -markupsafe==2.1.5 - # via jinja2 -mitogen==0.3.9 - # via -r requirements/zed/ubuntu_22.in -netaddr==1.3.0 - # via - # oslo-config - # oslo-utils -netifaces==0.11.0 - # via oslo-utils -oslo-config==9.5.0 - # via kolla-ansible -oslo-i18n==6.3.0 - # via - # oslo-config - # oslo-utils -oslo-utils==7.2.0 - # via kolla-ansible -packaging==24.1 - # via - # ansible-core - # oslo-utils -pbr==6.0.0 - # via - # kolla-ansible - # oslo-i18n - # stevedore -pycparser==2.22 - # via cffi -pyparsing==3.1.2 - # via oslo-utils -pyyaml==6.0.2 - # via - # ansible-core - # kolla-ansible - # oslo-config - # oslo-utils -requests==2.32.3 - # via - # hvac - # oslo-config -resolvelib==0.5.4 - # via ansible-core -rfc3986==2.0.0 - # via oslo-config -stevedore==5.2.0 - # via oslo-config -tzdata==2024.1 - # via oslo-utils -urllib3==2.2.2 - # via requests -wrapt==1.16.0 - # via debtcollector diff --git a/samples/aio/README.md b/samples/aio/README.md index 902cec384..77ef0f563 100644 --- a/samples/aio/README.md +++ b/samples/aio/README.md @@ -30,14 +30,14 @@ vagrant up This table displays the environment variables used to configure some aspects of the cluster, hardware resources and workflow. -| Name | Default | Description | -| :--------------------- | :------ | :-------------------------------------------------------------- | -| OS_DISTRO | centos | Specifies the Linux distribution to be used for this deployment | -| ENABLE_WEAVE_SCOPE | | Enable/Disable Weave Scope | -| OS_KOLLA_RUN_INIT | | Executes the [initialization Kolla script][2] | -| OS_KOLLA_ENABLE_MAGNUM | no | Enable/Disable [OpenStack Magnum service][4] | -| CPUS | 8 | Number of vCPUS assigned to the Virtual Machine | -| MEMORY | 16 GB | Memory assigned to the Virtual Machine | +| Name | Default | Description | +| :--------------------- | :-------- | :-------------------------------------------------------------- | +| OS_DISTRO | debian_11 | Specifies the Linux distribution to be used for this deployment | +| ENABLE_WEAVE_SCOPE | | Enable/Disable Weave Scope | +| OS_KOLLA_RUN_INIT | | Executes the [initialization Kolla script][2] | +| OS_KOLLA_ENABLE_MAGNUM | no | Enable/Disable [OpenStack Magnum service][4] | +| CPUS | 8 | Number of vCPUS assigned to the Virtual Machine | +| MEMORY | 16 GB | Memory assigned to the Virtual Machine | diff --git a/samples/noha/Vagrantfile b/samples/noha/Vagrantfile index e619e2795..d7c77dacf 100644 --- a/samples/noha/Vagrantfile +++ b/samples/noha/Vagrantfile @@ -68,8 +68,8 @@ Vagrant.configure("2") do |config| config.vm.provider :virtualbox config.vm.synced_folder "../../", "/vagrant" - config.vm.box = vagrant_boxes["ubuntu_20"]["name"] - config.vm.box_version = vagrant_boxes["ubuntu_20"]["version"] + config.vm.box = vagrant_boxes["ubuntu_22"]["name"] + config.vm.box_version = vagrant_boxes["ubuntu_22"]["version"] config.ssh.insert_key = false # Basic requirements installation