Skip to content

Commit 86c8141

Browse files
committed
Support elements repositories for overcloud host images
Change-Id: Ia8c927c330b9428a3824a6925f6274cbc54314a0 Story: 2002098 Task: 44165 (cherry picked from commit c4a116e)
1 parent 00daa5b commit 86c8141

File tree

2 files changed

+34
-0
lines changed

2 files changed

+34
-0
lines changed

ansible/overcloud-host-image-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
os_images_cache: "{{ image_cache_path }}"
2929
os_images_common: ""
3030
os_images_list: "{{ overcloud_dib_host_images }}"
31+
os_images_git_elements: "{{ overcloud_dib_git_elements }}"
3132
os_images_upload: False
3233
os_images_force_rebuild: "{{ overcloud_host_image_force_rebuild }}"
3334

doc/source/configuration/reference/overcloud-dib.rst

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,17 @@ the configuration drive built by Bifrost during provisioning.
7777
``overcloud_dib_env_vars_extra``.
7878
``overcloud_dib_packages``
7979
List of DIB packages to install. Default is to install no extra packages.
80+
``overcloud_dib_git_elements_default``
81+
List of default git repositories containing Diskimage Builder (DIB)
82+
elements. See stackhpc.os-images role for usage. Default is empty.
83+
``overcloud_dib_git_elements_extra``
84+
List of additional git repositories containing Diskimage Builder (DIB)
85+
elements. See stackhpc.os-images role for usage. Default is empty.
86+
``overcloud_dib_git_elements``
87+
List of git repositories containing Diskimage Builder (DIB) elements. See
88+
stackhpc.os-images role for usage. Default is a combination of
89+
``overcloud_dib_git_elements_default`` and
90+
``overcloud_dib_git_elements_extra``.
8091
``overcloud_dib_upper_constraints_file``
8192
Upper constraints file for installing packages in the virtual environment
8293
used for building overcloud host disk images. Default is ``{{
@@ -154,6 +165,28 @@ Alternatively, the :diskimage-builder-doc:`dynamic-login element
154165
<elements/dynamic-login/README>` can be used to authorize SSH keys by appending
155166
them to the kernel arguments.
156167

168+
Example: Configuring custom DIB elements
169+
----------------------------------------
170+
171+
Sometimes it is useful to use custom DIB elements that are not shipped with DIB
172+
itself. This can be done by sharing them in a git repository.
173+
174+
.. code-block:: yaml
175+
:caption: ``overcloud-dib.yml``
176+
177+
overcloud_dib_elements_extra:
178+
- "my-element"
179+
180+
overcloud_dib_git_elements:
181+
- repo: "https://git.example.com/custom-dib-elements"
182+
local: "{{ source_checkout_path }}/custom-dib-elements"
183+
version: "master"
184+
elements_path: "elements"
185+
186+
In this example the ``master`` branch of
187+
https://git.example.com/custom-dib-elements would have a top level ``elements``
188+
directory, containing a ``my-element`` directory for the element.
189+
157190
Example: Installing a package
158191
-----------------------------
159192

0 commit comments

Comments
 (0)