Image build updates, use StackHPC sources

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.

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.
@@ -99,7 +99,20 @@ kolla_openstack_release: wallaby-20211122T135752
 #     type: git
 #     location: https://github.com/openstack/ironic
 #     reference: master
-#kolla_sources:
+kolla_sources:
+  bifrost-base:
+    type: git
+    location: "{{ kolla_bifrost_source_url }}"
+    reference: "{{ kolla_bifrost_source_version }}"
+  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 +181,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 +209,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:

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?://', '') }}"