From a14d4e4a35a68c61636feb313a50384a84d97bbb Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Fri, 19 Aug 2022 11:01:27 +0100 Subject: [PATCH 1/6] Revert "Ubuntu: add host Apt repository configuration" The Ubuntu mirrors in Ark aren't ready yet. This reverts commit 31bc7455823f788f1becc5e063914802d68ebbb5. --- etc/kayobe/apt.yml | 26 ++++---------------------- etc/kayobe/kolla/globals.yml | 2 -- 2 files changed, 4 insertions(+), 24 deletions(-) diff --git a/etc/kayobe/apt.yml b/etc/kayobe/apt.yml index 627951c17..0d5dd6bd8 100644 --- a/etc/kayobe/apt.yml +++ b/etc/kayobe/apt.yml @@ -17,21 +17,13 @@ # * filename: name of a file in /etc/apt/apt.conf.d/ in which to write the # configuration # Default is an empty list. -apt_config: - # NOTE: Currently the Pulp verbatim publisher does not sync translation - # files, which results in apt update failing. Disable translations until this - # is resolved. - - content: | - Acquire::Languages "none"; - filename: 99no-languages +#apt_config: # 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 # Default is an empty list. -apt_keys: - - url: "https://download.docker.com/linux/ubuntu/gpg" - filename: docker.asc +#apt_keys: # A list of Apt repositories. # * types: whitespace-separated list of repository types, e.g. deb or deb-src @@ -46,22 +38,12 @@ apt_keys: # * architecture: whitespace-separated list of architectures that will be used # (optional, default is unset) # Default is an empty list. -apt_repositories: - - url: "{{ stackhpc_repo_ubuntu_focal_url }}" - suites: "{{ ansible_facts.distribution_release }} {{ ansible_facts.distribution_release }}-updates {{ ansible_facts.distribution_release }}-backports" - components: main restricted universe multiverse - - url: "{{ stackhpc_repo_ubuntu_focal_security_url }}" - suites: "{{ ansible_facts.distribution_release }}-security" - components: main restricted universe multiverse - - url: "{{ stackhpc_repo_docker_ce_ubuntu_url }}" - suites: "{{ ansible_facts.distribution_release }}" - components: stable - signed_by: docker.asc +#apt_repositories: # Whether to disable repositories in /etc/apt/sources.list. This may be used # when replacing the distribution repositories via apt_repositories. # Default is false. -apt_disable_sources_list: true +#apt_disable_sources_list: ############################################################################### # Dummy variable to allow Ansible to accept this file. diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 8a20a5145..9901ec267 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -1,7 +1,5 @@ # yamllint disable-file --- -enable_docker_repo: "{% raw %}{{ ansible_facts.os_family == 'RedHat' }}{% endraw %}" - docker_yum_baseurl: "{{ stackhpc_repo_docker_url }}" docker_yum_gpgkey: "https://download.docker.com/linux/{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}/gpg" From 356da17ba66899c2c5f17b995986e4d774a90ee3 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Fri, 19 Aug 2022 11:09:23 +0100 Subject: [PATCH 2/6] Ubuntu: stop syncing Ark Ubuntu mirrors to local Pulp The Ubuntu mirrors in Ark aren't ready yet. --- etc/kayobe/pulp.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/etc/kayobe/pulp.yml b/etc/kayobe/pulp.yml index 28939da9e..9c0545c39 100644 --- a/etc/kayobe/pulp.yml +++ b/etc/kayobe/pulp.yml @@ -32,7 +32,10 @@ stackhpc_release_pulp_content_url: "{{ stackhpc_release_pulp_url }}/pulp/content # Debs # Whether to sync Ubuntu packages. -stackhpc_pulp_sync_ubuntu_focal: "{{ os_distribution == 'ubuntu' }}" +# NOTE: Not currently syncing Ubuntu packages, since the on_demand mirror in +# Ark does not work if the upstream mirror pulls packages (which it does +# sometimes). +stackhpc_pulp_sync_ubuntu_focal: false stackhpc_pulp_repository_deb_repos: # Base Ubuntu Focal repositories From 1c7f77b48aa7dae07a4c7626664197b5a0ec2019 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Fri, 19 Aug 2022 11:27:39 +0100 Subject: [PATCH 3/6] Ubuntu: stop using Ark repo mirrors in container images The Ubuntu mirrors in Ark aren't ready yet. --- etc/kayobe/kolla.yml | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index d2c037353..75f58a793 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -211,13 +211,16 @@ kolla_build_blocks: -e 's/^[# ]*\(baseurl *=.*\)/#\1/g' \ -e '/#baseurl.*/a baseurl={{ repo.url }}' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} &&{% endif %} \ {% endfor %} - base_ubuntu_package_sources_list: | - RUN \ - rm -f /etc/apt/sources.list && \ - {% for repo in stackhpc_ubuntu_focal_repos %} - echo '{{ repo }}' >> /etc/apt/sources.list {% if not loop.last %} && \ - {% endif %} - {% endfor %} + # NOTE: Not currently syncing Ubuntu packages, since the on_demand mirror in + # Ark does not work if the upstream mirror pulls packages (which it does + # sometimes). + # base_ubuntu_package_sources_list: | + # RUN \ + # rm -f /etc/apt/sources.list && \ + # {% for repo in stackhpc_ubuntu_focal_repos %} + # echo '{{ repo }}' >> /etc/apt/sources.list {% if not loop.last %} && \ + # {% endif %} + # {% endfor %} grafana_plugins_install: | RUN grafana-cli plugins install vonage-status-panel ironic_inspector_header: | From e7ea0fa09d050853f7d97b2aef650e6d0ef8c371 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 23 Aug 2022 13:52:30 +0100 Subject: [PATCH 4/6] Ubuntu: use newly built Kolla images --- etc/kayobe/kolla.yml | 2 +- etc/kayobe/kolla/globals.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 75f58a793..2382158e4 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -91,7 +91,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: wallaby-20211207T102718 +kolla_openstack_release: "{% if kolla_base_distro == 'centos' %}wallaby-20211207T102718{% else %}wallaby-20220819T112725{% endif %}" # Docker tag applied to built container images. Default is # {{ kolla_openstack_release }}. diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 9901ec267..3b9e46de4 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -3,7 +3,6 @@ docker_yum_baseurl: "{{ stackhpc_repo_docker_url }}" docker_yum_gpgkey: "https://download.docker.com/linux/{% raw %}{{ ansible_facts.distribution | lower }}{% endraw %}/gpg" -{# We are not currently providing container images for Ubuntu in Wallaby. #} {% if kolla_base_distro == 'centos' %} barbican_tag: wallaby-20220311T133847 cinder_tag: wallaby-20220309T083940 From b32e6f23b5b333eed3726460006264a3c196d45e Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 24 Aug 2022 10:07:38 +0100 Subject: [PATCH 5/6] Ubuntu: set Bifrost image tag --- etc/kayobe/kolla/globals.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/kayobe/kolla/globals.yml b/etc/kayobe/kolla/globals.yml index 3b9e46de4..2596006f3 100644 --- a/etc/kayobe/kolla/globals.yml +++ b/etc/kayobe/kolla/globals.yml @@ -25,4 +25,6 @@ prometheus_libvirt_exporter_tag: wallaby-20220325T122042 prometheus_msteams_tag: wallaby-20220119T122428 prometheus_openstack_exporter_tag: wallaby-20220705T132206 skydive_tag: wallaby-20220811T091848 +{% else %} +bifrost_tag: wallaby-20220819T150635 {% endif %} From 4bfb234077d294846091f600f1b5fc8ad00db847 Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Wed, 24 Aug 2022 10:08:37 +0100 Subject: [PATCH 6/6] CI: add hook for seed container image build Without this, the seed tags artifact contains the overcloud images because ~/kolla_tag hasn't been updated. --- .../seed-container-image-build/post.d/50-write-kolla-tag.yml | 1 + 1 file changed, 1 insertion(+) create mode 120000 etc/kayobe/hooks/seed-container-image-build/post.d/50-write-kolla-tag.yml diff --git a/etc/kayobe/hooks/seed-container-image-build/post.d/50-write-kolla-tag.yml b/etc/kayobe/hooks/seed-container-image-build/post.d/50-write-kolla-tag.yml new file mode 120000 index 000000000..c685974a2 --- /dev/null +++ b/etc/kayobe/hooks/seed-container-image-build/post.d/50-write-kolla-tag.yml @@ -0,0 +1 @@ +../../../ansible/write-kolla-tag.yml \ No newline at end of file