diff --git a/.github/workflows/stackhpc-all-in-one.yml b/.github/workflows/stackhpc-all-in-one.yml index 4c0a62f45..c6e9de859 100644 --- a/.github/workflows/stackhpc-all-in-one.yml +++ b/.github/workflows/stackhpc-all-in-one.yml @@ -232,3 +232,8 @@ jobs: OS_APPLICATION_CREDENTIAL_ID: ${{ secrets.OS_APPLICATION_CREDENTIAL_ID }} OS_APPLICATION_CREDENTIAL_SECRET: ${{ secrets.OS_APPLICATION_CREDENTIAL_SECRET }} if: always() + + - name: Prune Docker images over 1 week old + # May fail if another prune is running + run: sudo docker image prune --force --filter until=168h || true + if: always() diff --git a/.github/workflows/stackhpc-container-image-build.yml b/.github/workflows/stackhpc-container-image-build.yml index 4a639ba73..f93e24d71 100644 --- a/.github/workflows/stackhpc-container-image-build.yml +++ b/.github/workflows/stackhpc-container-image-build.yml @@ -43,7 +43,7 @@ jobs: uses: actions/checkout@v3 with: repository: stackhpc/kayobe - ref: refs/heads/stackhpc/xena + ref: refs/heads/stackhpc/yoga path: src/kayobe # FIXME: Failed in kolla-ansible : Ensure the latest version of pip is installed diff --git a/.github/workflows/stackhpc-promote.yml b/.github/workflows/stackhpc-promote.yml index 69a245baf..0b4400178 100644 --- a/.github/workflows/stackhpc-promote.yml +++ b/.github/workflows/stackhpc-promote.yml @@ -4,7 +4,7 @@ on: push: branches: # NOTE(mgoddard): Reference only the current release branch here. - - stackhpc/xena + - stackhpc/yoga jobs: promote: name: Trigger package repository promotion diff --git a/.github/workflows/tag-and-release.yml b/.github/workflows/tag-and-release.yml index af47d87b5..7ca4917db 100644 --- a/.github/workflows/tag-and-release.yml +++ b/.github/workflows/tag-and-release.yml @@ -3,7 +3,7 @@ name: Tag & Release 'on': push: branches: - - stackhpc/xena + - stackhpc/yoga permissions: contents: write jobs: diff --git a/.gitreview b/.gitreview index 9a46b9497..9c0b64bdf 100644 --- a/.gitreview +++ b/.gitreview @@ -2,4 +2,4 @@ host=review.opendev.org port=29418 project=openstack/kayobe-config.git -defaultbranch=stable/xena +defaultbranch=stable/yoga diff --git a/README.rst b/README.rst index dfd27bfa6..8c191d47d 100644 --- a/README.rst +++ b/README.rst @@ -2,7 +2,7 @@ StackHPC Kayobe Configuration ============================= -This repository provides a base Kayobe configuration for the Xena release +This repository provides a base Kayobe configuration for the Yoga release of StackHPC OpenStack. StackHPC release train @@ -45,7 +45,7 @@ when used with Kayobe's `multiple environments feature. This configuration should be consumed using the `StackHPC Kayobe fork -`__, which includes +`__, which includes backported support for Ansible collections. New deployments @@ -56,7 +56,7 @@ your configuration. .. code-block:: console - git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/xena + git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/yoga Existing deployments -------------------- @@ -68,7 +68,7 @@ need to merge the changes in this repository into your repository. git remote add stackhpc https://github.com/stackhpc/stackhpc-kayobe-config git fetch stackhpc - git merge stackhpc/stackhpc/xena + git merge stackhpc/stackhpc/yoga Updating -------- @@ -80,7 +80,7 @@ consume these updates by merging in the changes with their local configuration. .. code-block:: console git fetch stackhpc - git merge stackhpc/stackhpc/xena + git merge stackhpc/stackhpc/yoga The intention is to avoid merge conflicts where possible, but there may be cases where this is difficult. We are open to discussion on how best to @@ -125,13 +125,13 @@ Usage ===== The local Pulp service will be deployed as a `Seed custom container -`__ +`__ on next ``kayobe seed service deploy`` or ``kayobe seed service upgrade``. The following custom playbooks are provided in ``etc/kayobe/ansible/``: See the Kayobe `custom playbook documentation -`__ +`__ for information on how to run them. * ``pulp-repo-sync.yml``: Pull packages from Ark to the local Pulp. This will @@ -260,8 +260,8 @@ Clone the Kayobe and Kayobe configuration repositories (this one): cd mkdir -p src pushd src - git clone https://github.com/stackhpc/kayobe.git -b stackhpc/xena - git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/xena kayobe-config + git clone https://github.com/stackhpc/kayobe.git -b stackhpc/yoga + git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/yoga kayobe-config popd Create a virtual environment and install Kayobe: @@ -374,8 +374,8 @@ Clone the Kayobe and Kayobe configuration repositories (this one): cd mkdir -p src pushd src - git clone https://github.com/stackhpc/kayobe.git -b stackhpc/xena - git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/xena kayobe-config + git clone https://github.com/stackhpc/kayobe.git -b stackhpc/yoga + git clone https://github.com/stackhpc/stackhpc-kayobe-config -b stackhpc/yoga kayobe-config popd Create a virtual environment and install Kayobe: @@ -440,7 +440,7 @@ At this point you are ready to build and push some container images. kayobe seed container image build --push kayobe overcloud container image build --push -The container images are tagged as ``xena-``. This Kayobe +The container images are tagged as ``yoga-``. This Kayobe configuration includes a hook that writes the tag to ``~/kolla_tag``, since it is not always simple to determine which tag was last applied to built images. @@ -452,7 +452,7 @@ tag as the value of the ``kolla_openstack_release`` variable. Resources ========= -* Kayobe documentation: https://docs.openstack.org/kayobe/xena/ +* Kayobe documentation: https://docs.openstack.org/kayobe/yoga/ * Kayobe source: https://opendev.org/openstack/kayobe * Kayobe bugs: https://storyboard.openstack.org/#!/project/openstack/kayobe-config * IRC: #openstack-kolla diff --git a/etc/kayobe/apt.yml b/etc/kayobe/apt.yml index 0d5dd6bd8..34bfdd2ef 100644 --- a/etc/kayobe/apt.yml +++ b/etc/kayobe/apt.yml @@ -21,11 +21,12 @@ # List of apt keys. Each item is a dict containing the following keys: # * url: URL of key -# * filename: Name of a file in which to store the downloaded key +# * filename: Name of a file in which to store the downloaded key. The +# extension should be '.asc' for ASCII-armoured keys, or '.gpg' otherwise. # Default is an empty list. #apt_keys: -# A list of Apt repositories. +# A list of Apt repositories. Each item is a dict with the following keys: # * types: whitespace-separated list of repository types, e.g. deb or deb-src # (optional, default is 'deb') # * url: URL of the repository diff --git a/etc/kayobe/dnf.yml b/etc/kayobe/dnf.yml index c63276a28..d678a413e 100644 --- a/etc/kayobe/dnf.yml +++ b/etc/kayobe/dnf.yml @@ -109,8 +109,8 @@ dnf_enable_epel: "{{ dnf_install_epel | bool }}" dnf_epel_gpg_key_url: "https://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-8" # Whether to install the epel-release package. This affects RedHat-based -# systems only. Default value is 'true'. -dnf_install_epel: false +# systems only. Default value is 'false'. +#dnf_install_epel: ############################################################################### # DNF Automatic configuration. diff --git a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml index 246707c97..f10d1a6b6 100644 --- a/etc/kayobe/environments/ci-aio/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-aio/stackhpc-ci.yml @@ -34,13 +34,13 @@ stackhpc_repo_docker_version: "{{ stackhpc_pulp_repo_docker_version }}" stackhpc_repo_centos_stream_advanced_virtualization_version: "{{ stackhpc_pulp_repo_centos_stream_8_advanced_virtualization_version }}" stackhpc_repo_centos_stream_nfv_extras_version: "{{ stackhpc_pulp_repo_centos_stream_8_nfv_extras_version }}" stackhpc_repo_centos_stream_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version }}" -stackhpc_repo_centos_stream_openstack_xena_version: "{{ stackhpc_pulp_repo_centos_stream_8_openstack_xena_version }}" +stackhpc_repo_centos_stream_openstack_yoga_version: "{{ stackhpc_pulp_repo_centos_stream_8_openstack_yoga_version }}" stackhpc_repo_centos_stream_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_8_opstools_version }}" stackhpc_repo_centos_stream_powertools_version: "{{ stackhpc_pulp_repo_centos_stream_8_powertools_version }}" stackhpc_repo_centos_stream_storage_ceph_pacific_version: "{{ stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}" stackhpc_repo_elasticsearch_logstash_kibana_7_x_version: "{{ stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version }}" stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}" -stackhpc_repo_mariadb_10_5_centos8_version: "{{ stackhpc_pulp_repo_mariadb_10_5_centos8_version }}" +stackhpc_repo_mariadb_10_6_centos8_version: "{{ stackhpc_pulp_repo_mariadb_10_6_centos8_version }}" stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rabbitmq_erlang_version }}" stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rabbitmq_server_version }}" stackhpc_repo_treasuredata_4_version: "{{ stackhpc_pulp_repo_treasuredata_4_version }}" diff --git a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml index 4a9e50f1c..afe1d0dbb 100644 --- a/etc/kayobe/environments/ci-builder/stackhpc-ci.yml +++ b/etc/kayobe/environments/ci-builder/stackhpc-ci.yml @@ -54,13 +54,13 @@ stackhpc_repo_docker_version: "{{ stackhpc_pulp_repo_docker_version }}" stackhpc_repo_centos_stream_advanced_virtualization_version: "{{ stackhpc_pulp_repo_centos_stream_8_advanced_virtualization_version }}" stackhpc_repo_centos_stream_nfv_extras_version: "{{ stackhpc_pulp_repo_centos_stream_8_nfv_extras_version }}" stackhpc_repo_centos_stream_nfv_openvswitch_version: "{{ stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version }}" -stackhpc_repo_centos_stream_openstack_xena_version: "{{ stackhpc_pulp_repo_centos_stream_8_openstack_xena_version }}" +stackhpc_repo_centos_stream_openstack_yoga_version: "{{ stackhpc_pulp_repo_centos_stream_8_openstack_yoga_version }}" stackhpc_repo_centos_stream_opstools_version: "{{ stackhpc_pulp_repo_centos_stream_8_opstools_version }}" stackhpc_repo_centos_stream_powertools_version: "{{ stackhpc_pulp_repo_centos_stream_8_powertools_version }}" stackhpc_repo_centos_stream_storage_ceph_pacific_version: "{{ stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version }}" stackhpc_repo_elasticsearch_logstash_kibana_7_x_version: "{{ stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version }}" stackhpc_repo_grafana_version: "{{ stackhpc_pulp_repo_grafana_version }}" -stackhpc_repo_mariadb_10_5_centos8_version: "{{ stackhpc_pulp_repo_mariadb_10_5_centos8_version }}" +stackhpc_repo_mariadb_10_6_centos8_version: "{{ stackhpc_pulp_repo_mariadb_10_6_centos8_version }}" stackhpc_repo_rabbitmq_erlang_version: "{{ stackhpc_pulp_repo_rabbitmq_erlang_version }}" stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_pulp_repo_rabbitmq_server_version }}" stackhpc_repo_treasuredata_4_version: "{{ stackhpc_pulp_repo_treasuredata_4_version }}" diff --git a/etc/kayobe/infra-vms.yml b/etc/kayobe/infra-vms.yml index e16adea1d..3274ed806 100644 --- a/etc/kayobe/infra-vms.yml +++ b/etc/kayobe/infra-vms.yml @@ -35,7 +35,7 @@ # http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2 # when os_distribution is "rocky", # or -# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2" +# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2" # otherwise. #infra_vm_root_image: diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 61b7253e7..38f0741f7 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -96,7 +96,7 @@ kolla_docker_registry_password: "{{ stackhpc_docker_registry_password }}" # Kolla OpenStack release version. This should be a Docker image tag. # Default is {{ openstack_release }}. -kolla_openstack_release: xena-20221010T103511 +kolla_openstack_release: yoga-20221007T094200 # Docker tag applied to built container images. Default is # {{ kolla_openstack_release }}. @@ -111,10 +111,6 @@ kolla_openstack_release: xena-20221010T103511 # location: https://github.com/openstack/ironic # reference: master kolla_sources: - bifrost-base: - type: git - location: "{{ kolla_bifrost_source_url }}" - reference: "{{ kolla_bifrost_source_version }}" bifrost-base-additions-stackhpc-inspector-plugins: # Install our custom inspector plugins. type: git @@ -123,11 +119,11 @@ kolla_sources: cloudkitty-base: type: git location: https://github.com/stackhpc/cloudkitty.git - reference: stackhpc/xena + reference: stackhpc/{{ openstack_release }} horizon-plugin-cloudkitty-dashboard: type: git location: https://github.com/stackhpc/cloudkitty-dashboard.git - reference: stackhpc/xena + reference: stackhpc/{{ openstack_release }} ironic-inspector-additions-stackhpc-inspector-plugins: # Install our custom inspector plugins. type: git @@ -136,11 +132,11 @@ kolla_sources: magnum-base: type: git location: https://github.com/stackhpc/magnum.git - reference: stackhpc/xena + reference: stackhpc/{{ openstack_release }} neutron-base-plugin-networking-generic-switch: type: git location: https://github.com/stackhpc/networking-generic-switch.git - reference: stackhpc/xena + reference: stackhpc/{{ openstack_release }} ############################################################################### # Kolla image build configuration. @@ -169,8 +165,8 @@ stackhpc_centos_additional_repos: file: "CentOS-NFV-extras.repo" - url: "{{ stackhpc_repo_centos_stream_nfv_openvswitch_url }}" file: "CentOS-NFV-OpenvSwitch.repo" - - url: "{{ stackhpc_repo_centos_stream_openstack_xena_url }}" - file: "CentOS-OpenStack-xena.repo" + - url: "{{ stackhpc_repo_centos_stream_openstack_yoga_url }}" + file: "CentOS-OpenStack-yoga.repo" - url: "{{ stackhpc_repo_centos_stream_opstools_url }}" file: "CentOS-OpsTools.repo" - url: "{{ stackhpc_repo_centos_stream_powertools_url }}" @@ -184,7 +180,7 @@ stackhpc_third_party_repos: file: "elasticsearch.repo" - url: "{{ stackhpc_repo_grafana_url }}" file: "grafana.repo" - - url: "{{ stackhpc_repo_mariadb_10_5_centos8_url }}" + - url: "{{ stackhpc_repo_mariadb_10_6_centos8_url }}" file: "mariadb.repo" - url: "{{ stackhpc_repo_rabbitmq_erlang_url }}" file: "rabbitmq_rabbitmq-erlang.repo" @@ -456,6 +452,7 @@ kolla_build_args: #kolla_enable_ceilometer: #kolla_enable_ceilometer_horizon_policy_file: #kolla_enable_ceilometer_ipmi: +#kolla_enable_ceilometer_prometheus_pushgateway: #kolla_enable_cells: kolla_enable_central_logging: true #kolla_enable_ceph_rgw: @@ -516,7 +513,6 @@ kolla_enable_grafana: true #kolla_enable_horizon_zun: #kolla_enable_influxdb: #kolla_enable_ironic: -#kolla_enable_ironic_ipxe: #kolla_enable_ironic_neutron_agent: #kolla_enable_ironic_pxe_uefi: #kolla_enable_iscsid: @@ -563,6 +559,7 @@ kolla_enable_grafana: true #kolla_enable_nova: #kolla_enable_nova_fake: #kolla_enable_nova_horizon_policy_file: +#kolla_enable_nova_libvirt_container: #kolla_enable_nova_serialconsole_proxy: #kolla_enable_nova_ssh: #kolla_enable_octavia: @@ -580,6 +577,7 @@ kolla_enable_prometheus: true #kolla_enable_prometheus_cadvisor: #kolla_enable_prometheus_ceph_mgr_exporter: #kolla_enable_prometheus_elasticsearch_exporter: +#kolla_enable_prometheus_etcd_integration: #kolla_enable_prometheus_fluentd_integration: #kolla_enable_prometheus_haproxy_exporter: #kolla_enable_prometheus_libvirt_exporter: @@ -604,9 +602,9 @@ kolla_enable_prometheus: true #kolla_enable_telegraf: #kolla_enable_trove: #kolla_enable_trove_singletenant: +#kolla_enable_venus: #kolla_enable_vitrage: #kolla_enable_vitrage_prometheus_datasource: -#kolla_enable_vmtp: #kolla_enable_watcher: #kolla_enable_zookeeper: #kolla_enable_zun: @@ -652,9 +650,6 @@ kolla_enable_prometheus: true # certificate bundle for the external API. # # Note that this should be formatted as a literal style block scalar. -# -# NOTE: kolla_tls_cert has been renamed to kolla_external_tls_cert. Support for -# the deprecated name kolla_tls_cert will be removed in a future release. #kolla_external_tls_cert: # Path to a CA certificate file to use for the OS_CACERT environment variable diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index a59e1d492..29bc3a2d2 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -3,6 +3,10 @@ docker_yum_baseurl: "{{ stackhpc_repo_docker_url }}" docker_yum_gpgkey: "https://download.docker.com/linux/centos/gpg" +{% if kolla_base_distro == 'centos' %} +bifrost_tag: yoga-20221007T134036 +{% endif %} + # Monitoring and alerting related settings es_heap_size: 8g -prometheus_cmdline_extras: "--storage.tsdb.retention.time=30d" \ No newline at end of file +prometheus_cmdline_extras: "--storage.tsdb.retention.time=30d" diff --git a/etc/kayobe/networks.yml b/etc/kayobe/networks.yml index eabe52eb3..904311677 100644 --- a/etc/kayobe/networks.yml +++ b/etc/kayobe/networks.yml @@ -196,6 +196,15 @@ # 'name' items. These tables will be added to /etc/iproute2/rt_tables. #network_route_tables: +############################################################################### +# Network connectivity check configuration. + +# External IP address to check. Default is 8.8.8.8. +#nc_external_ip: + +# External hostname to check. Default is google.com. +#nc_external_hostname: + ############################################################################### # Dummy variable to allow Ansible to accept this file. workaround_ansible_issue_8743: yes diff --git a/etc/kayobe/openstack.yml b/etc/kayobe/openstack.yml index f2fe55aa1..67ad989b0 100644 --- a/etc/kayobe/openstack.yml +++ b/etc/kayobe/openstack.yml @@ -2,10 +2,10 @@ ############################################################################### # OpenStack release configuration. -# Name of the current OpenStack release. Default is "xena". +# Name of the current OpenStack release. Default is "yoga". #openstack_release: -# Name of the current OpenStack branch. Default is "stable/xena". +# Name of the current OpenStack branch. Default is "stable/yoga". #openstack_branch: ############################################################################### diff --git a/etc/kayobe/pulp-repo-versions.yml b/etc/kayobe/pulp-repo-versions.yml index d67eefc19..075662dc4 100644 --- a/etc/kayobe/pulp-repo-versions.yml +++ b/etc/kayobe/pulp-repo-versions.yml @@ -6,17 +6,17 @@ stackhpc_pulp_repo_centos_stream_8_baseos_version: 20220817T082321 stackhpc_pulp_repo_centos_stream_8_extras_version: 20220401T032901 stackhpc_pulp_repo_centos_stream_8_nfv_extras_version: 20220609T110556 stackhpc_pulp_repo_centos_stream_8_nfv_openvswitch_version: 20220824T113700 -stackhpc_pulp_repo_centos_stream_8_openstack_xena_version: 20220823T042339 +stackhpc_pulp_repo_centos_stream_8_openstack_yoga_version: 20220819T111114 stackhpc_pulp_repo_centos_stream_8_opstools_version: 20220617T100837 stackhpc_pulp_repo_centos_stream_8_powertools_version: 20220817T082321 stackhpc_pulp_repo_centos_stream_8_storage_ceph_pacific_version: 20220803T043053 -stackhpc_pulp_repo_docker_ce_ubuntu_version: 20220708T132615 +stackhpc_pulp_repo_docker_ce_ubuntu_version: 20220828T050510 stackhpc_pulp_repo_docker_version: 20220828T050510 stackhpc_pulp_repo_elasticsearch_logstash_kibana_7_x_version: 20220825T041159 stackhpc_pulp_repo_epel_modular_version: 20220828T050510 stackhpc_pulp_repo_epel_version: 20220830T054227 stackhpc_pulp_repo_grafana_version: 20220831T050502 -stackhpc_pulp_repo_mariadb_10_5_centos8_version: 20220817T082321 +stackhpc_pulp_repo_mariadb_10_6_centos8_version: 20220819T111114 stackhpc_pulp_repo_rabbitmq_erlang_version: 20220828T050510 stackhpc_pulp_repo_rabbitmq_server_version: 20220803T043053 stackhpc_pulp_repo_treasuredata_4_version: 20220823T042339 diff --git a/etc/kayobe/seed-vm.yml b/etc/kayobe/seed-vm.yml index 59dc766ae..f8c2ab8a9 100644 --- a/etc/kayobe/seed-vm.yml +++ b/etc/kayobe/seed-vm.yml @@ -25,8 +25,12 @@ # Base image for the seed VM root volume. Default is # "https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img" -# when os_distribution is "ubuntu", or -# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210210.0.x86_64.qcow2" +# when os_distribution is "ubuntu", +# http://dl.rockylinux.org/pub/rocky/8.5/images/Rocky-8-GenericCloud-8.5-20211114.2.x86_64.qcow2 +# when os_distribution is "rocky", +# or +# "https://cloud.centos.org/centos/8-stream/x86_64/images/CentOS-Stream-GenericCloud-8-20210603.0.x86_64.qcow2" +# otherwise. #seed_vm_root_image: # Capacity of the seed VM data volume. diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml index b0d1b0d41..aa738dd0a 100644 --- a/etc/kayobe/stackhpc.yml +++ b/etc/kayobe/stackhpc.yml @@ -63,9 +63,9 @@ stackhpc_repo_centos_stream_nfv_extras_version: "{{ stackhpc_repo_distribution } stackhpc_repo_centos_stream_nfv_openvswitch_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/nfv/x86_64/openvswitch-2/{{ stackhpc_repo_centos_stream_nfv_openvswitch_version }}" stackhpc_repo_centos_stream_nfv_openvswitch_version: "{{ stackhpc_repo_distribution }}" -# CentOS Stream 8 - OpenStack Xena -stackhpc_repo_centos_stream_openstack_xena_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/cloud/x86_64/openstack-xena/{{ stackhpc_repo_centos_stream_openstack_xena_version }}" -stackhpc_repo_centos_stream_openstack_xena_version: "{{ stackhpc_repo_distribution }}" +# CentOS Stream 8 - OpenStack Yoga +stackhpc_repo_centos_stream_openstack_yoga_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/cloud/x86_64/openstack-yoga/{{ stackhpc_repo_centos_stream_openstack_yoga_version }}" +stackhpc_repo_centos_stream_openstack_yoga_version: "{{ stackhpc_repo_distribution }}" # CentOS Stream 8 - OpsTools - collectd stackhpc_repo_centos_stream_opstools_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/centos/8-stream/opstools/x86_64/collectd-5/{{ stackhpc_repo_centos_stream_opstools_version }}" @@ -87,9 +87,9 @@ stackhpc_repo_elasticsearch_logstash_kibana_7_x_version: "{{ stackhpc_repo_distr stackhpc_repo_grafana_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/grafana/oss/rpm/{{ stackhpc_repo_grafana_version }}" stackhpc_repo_grafana_version: "{{ stackhpc_repo_distribution }}" -# MariaDB 10.5 CentOS 8 -stackhpc_repo_mariadb_10_5_centos8_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/mariadb-10.5/yum/centos8-amd64/{{ stackhpc_repo_mariadb_10_5_centos8_version }}" -stackhpc_repo_mariadb_10_5_centos8_version: "{{ stackhpc_repo_distribution }}" +# MariaDB 10.6 CentOS 8 +stackhpc_repo_mariadb_10_6_centos8_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/mariadb-10.6/yum/centos8-amd64/{{ stackhpc_repo_mariadb_10_6_centos8_version }}" +stackhpc_repo_mariadb_10_6_centos8_version: "{{ stackhpc_repo_distribution }}" # RabbitMQ - Erlang stackhpc_repo_rabbitmq_erlang_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/rabbitmq/erlang/el/8/x86_64/{{ stackhpc_repo_rabbitmq_erlang_version }}" @@ -118,10 +118,6 @@ stackhpc_repo_rocky_extras_version: "{{ stackhpc_repo_distribution }}" ############################################################################### # Sources -# Bifrost source repository. -stackhpc_bifrost_source_url: "https://github.com/stackhpc/bifrost" -stackhpc_bifrost_source_version: "stackhpc/{{ openstack_release }}" - # Kolla source repository. stackhpc_kolla_source_url: "https://github.com/stackhpc/kolla" stackhpc_kolla_source_version: "stackhpc/{{ openstack_release }}" diff --git a/releasenotes/config.yaml b/releasenotes/config.yaml index 55f94b723..125c1a52d 100644 --- a/releasenotes/config.yaml +++ b/releasenotes/config.yaml @@ -1,4 +1,4 @@ --- # This needs to be updated to the latest release. -default_branch: stackhpc/xena +default_branch: stackhpc/yoga release_tag_re: stackhpc/\d+\.\d+\.\d+\.\d diff --git a/releasenotes/source/index.rst b/releasenotes/source/index.rst index e1ea00229..0e043fd39 100644 --- a/releasenotes/source/index.rst +++ b/releasenotes/source/index.rst @@ -7,6 +7,7 @@ Contents .. toctree:: :maxdepth: 2 + yoga xena wallaby diff --git a/releasenotes/source/yoga.rst b/releasenotes/source/yoga.rst new file mode 100644 index 000000000..c2181c53a --- /dev/null +++ b/releasenotes/source/yoga.rst @@ -0,0 +1,6 @@ +========================= +Yoga Series Release Notes +========================= + +.. release-notes:: + :branch: stackhpc/yoga diff --git a/requirements.txt b/requirements.txt index ae14ea044..01f79d8b3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1 +1 @@ -git+https://github.com/stackhpc/kayobe@stackhpc/xena +git+https://github.com/stackhpc/kayobe@stackhpc/yoga diff --git a/terraform/aio/README.rst b/terraform/aio/README.rst index f3b29cda1..3646b757d 100644 --- a/terraform/aio/README.rst +++ b/terraform/aio/README.rst @@ -104,12 +104,6 @@ Apply the changes: terraform apply -auto-approve -Use the ci-aio environment: - -.. code-block:: console - - export KAYOBE_ENVIRONMENT=ci-aio - Write Terraform outputs to a Kayobe config file: .. code-block:: console @@ -152,6 +146,12 @@ Build a Kayobe image: sudo DOCKER_BUILDKIT=1 docker build --file .automation/docker/kayobe/Dockerfile --tag kayobe:latest . +Use the ci-aio environment: + +.. code-block:: console + + export KAYOBE_ENVIRONMENT=ci-aio + Set the Kayobe Vault password env var: .. code-block:: console diff --git a/tox.ini b/tox.ini index 5e1f5a7cb..9fea205c1 100644 --- a/tox.ini +++ b/tox.ini @@ -6,7 +6,7 @@ skipsdist = True [testenv] install_command = pip install {opts} {packages} deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga} -r{toxinidir}/test-requirements.txt [testenv:pep8] @@ -18,7 +18,7 @@ commands = allowlist_externals = rm skip_install = true deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/xena} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/yoga} -r{toxinidir}/releasenotes/requirements.txt commands = rm -rf releasenotes/build/html