From d4ddd684c6bc93e468001d84f0d0aa43e8b2fdaf Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Mon, 29 Nov 2021 17:23:36 +0000 Subject: [PATCH 1/4] Refactor container config to use sources and additions --- etc/kayobe/kolla.yml | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 9c3c69bcb7..e8fa41c732 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -99,7 +99,16 @@ kolla_openstack_release: wallaby-20211122T135752 # type: git # location: https://github.com/openstack/ironic # reference: master -#kolla_sources: +kolla_sources: + ironic-inspector-additions-stackhpc-inspector-plugins: + # Install our custom inspector plugins. + type: git + location: https://github.com/stackhpc/stackhpc-inspector-plugins.git + reference: 1.1.2 + magnum-base: + type: git + location: https://github.com/stackhpc/magnum.git + reference: stackhpc/wallaby ############################################################################### # Kolla image build configuration. @@ -168,20 +177,10 @@ kolla_build_blocks: -e '/#baseurl.*/a baseurl={{ repo.url }}' /etc/yum.repos.d/{{ repo.file }}{% if not loop.last %} &&{% endif %} \ {% endfor %} - ironic_inspector_footer: | - # Install our custom inspector plugins. - RUN pip3 install git+https://github.com/stackhpc/stackhpc-inspector-plugins.git@1.1.2 \ - -c https://releases.openstack.org/constraints/upper/wallaby - magnum_api_footer: | - # Install StackHPC release of Magnum. - RUN pip3 install git+https://github.com/stackhpc/magnum.git@stackhpc/wallaby \ - -c https://releases.openstack.org/constraints/upper/wallaby - magnum_conductor_footer: | - # Install StackHPC release of Magnum. - RUN pip3 install git+https://github.com/stackhpc/magnum.git@stackhpc/wallaby \ - -c https://releases.openstack.org/constraints/upper/wallaby grafana_plugins_install: | RUN grafana-cli plugins install vonage-status-panel + ironic_inspector_header: | + ADD additions-archive / prometheus_v2_server_repository_version: | ARG prometheus_version='2.30.0' prometheus_alertmanager_repository_version: | @@ -206,6 +205,8 @@ kolla_build_blocks: # customization is most commonly packages. The operation should be one of # override, append or remove. The value should be a list. kolla_build_customizations: + ironic_inspector_pip_packages_append: + - /additions/* ovn_base_packages_override: - ovn-2021-21.06.0 ovn_controller_packages_override: From 187ed2b3e3fe258cf5ff4dd383a50d5fd729f1d9 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 30 Nov 2021 08:09:24 +0100 Subject: [PATCH 2/4] Add stackhpc/bifrost to kolla_sources --- etc/kayobe/kolla.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index e8fa41c732..017659f026 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -100,6 +100,10 @@ kolla_openstack_release: wallaby-20211122T135752 # location: https://github.com/openstack/ironic # reference: master kolla_sources: + bifrost-base: + type: git + location: https://github.com/stackhpc/bifrost.git + reference: stackhpc/wallaby ironic-inspector-additions-stackhpc-inspector-plugins: # Install our custom inspector plugins. type: git From 8bea3136a9cc793afea953ed6f26ed54e739e672 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 30 Nov 2021 09:53:27 +0100 Subject: [PATCH 3/4] Update kolla_sources bifrost url --- etc/kayobe/kolla.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 017659f026..66b82fb281 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -102,8 +102,8 @@ kolla_openstack_release: wallaby-20211122T135752 kolla_sources: bifrost-base: type: git - location: https://github.com/stackhpc/bifrost.git - reference: stackhpc/wallaby + location: "{{ kolla_bifrost_source_url }}" + reference: "{{ kolla_bifrost_source_version }}" ironic-inspector-additions-stackhpc-inspector-plugins: # Install our custom inspector plugins. type: git From d17b9bec3bba2a079d74ec6c7b933c351806dfca Mon Sep 17 00:00:00 2001 From: Mark Goddard Date: Tue, 7 Dec 2021 09:58:24 +0000 Subject: [PATCH 4/4] Use StackHPC forks of bifrost, kolla and kolla-ansible Currently we are using the stackhpc/wallaby branches. This should switch to using tagged releases. --- etc/kayobe/bifrost.yml | 4 ++-- etc/kayobe/kolla.yml | 8 ++++---- etc/kayobe/stackhpc.yml | 12 ++++++++++++ 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/etc/kayobe/bifrost.yml b/etc/kayobe/bifrost.yml index 34f84ef32b..36cc215787 100644 --- a/etc/kayobe/bifrost.yml +++ b/etc/kayobe/bifrost.yml @@ -5,11 +5,11 @@ # Bifrost installation. # URL of Bifrost source code repository. -#kolla_bifrost_source_url: +kolla_bifrost_source_url: "{{ stackhpc_bifrost_source_url }}" # Version (branch, tag, etc.) of Bifrost source code repository. Default is # {{ openstack_branch }}. -#kolla_bifrost_source_version: +kolla_bifrost_source_version: "{{ stackhpc_bifrost_source_version }}" # Firewalld zone used by Bifrost. Default is "trusted", to avoid blocking other # services running on the seed host. diff --git a/etc/kayobe/kolla.yml b/etc/kayobe/kolla.yml index 66b82fb281..9211ac4c3a 100644 --- a/etc/kayobe/kolla.yml +++ b/etc/kayobe/kolla.yml @@ -11,11 +11,11 @@ #kolla_source_path: # URL of Kolla source code repository if type is 'source'. -#kolla_source_url: +kolla_source_url: "{{ stackhpc_kolla_source_url }}" # Version (branch, tag, etc.) of Kolla source code repository if type is # 'source'. Default is {{ openstack_branch }}. -#kolla_source_version: +kolla_source_version: "{{ stackhpc_kolla_source_version }}" # Path to virtualenv in which to install kolla. #kolla_venv: @@ -37,11 +37,11 @@ # URL of Kolla Ansible source code repository if type is 'source'. Default is # https://opendev.org/openstack/kolla-ansible. -#kolla_ansible_source_url: +kolla_ansible_source_url: "{{ stackhpc_kolla_ansible_source_url }}" # Version (branch, tag, etc.) of Kolla Ansible source code repository if type # is 'source'. Default is {{ openstack_branch }}. -#kolla_ansible_source_version: +kolla_ansible_source_version: "{{ stackhpc_kolla_ansible_source_version }}" # Path to virtualenv in which to install kolla-ansible. Default is # $KOLLA_VENV_PATH or $PWD/venvs/kolla-ansible if $KOLLA_VENV_PATH is not set. diff --git a/etc/kayobe/stackhpc.yml b/etc/kayobe/stackhpc.yml index d2cd6d8e7a..8f65d35924 100644 --- a/etc/kayobe/stackhpc.yml +++ b/etc/kayobe/stackhpc.yml @@ -73,6 +73,18 @@ stackhpc_repo_rabbitmq_server_version: "{{ stackhpc_repo_distribution }}" stackhpc_repo_treasuredata_4_url: "{{ stackhpc_repo_mirror_url }}/pulp/content/treasuredata/4/redhat/8/x86_64/{{ stackhpc_repo_treasuredata_4_version }}" stackhpc_repo_treasuredata_4_version: "{{ stackhpc_repo_distribution }}" +# 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 }}" + +# Kolla Ansible source repository. +stackhpc_kolla_ansible_source_url: "https://github.com/stackhpc/kolla-ansible" +stackhpc_kolla_ansible_source_version: "stackhpc/{{ openstack_release }}" + # Host and port of container registry. stackhpc_docker_registry: "{{ pulp_url | regex_replace('^https?://', '') }}"