Skip to content

Commit 22448a0

Browse files
committed
DNM: FIXMEs, TODOs, general musings
1 parent 8b7ea25 commit 22448a0

File tree

9 files changed

+17
-7
lines changed

9 files changed

+17
-7
lines changed

doc/source/configuration/host-images.rst

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ When configured, an image will be downloaded to the seed during the
1414
``kayobe seed service deploy`` step, and subsequently deployed using bifrost
1515
with ``kayobe overcloud provision``.
1616

17+
FIXME: Should we do this by default in Zed+?
18+
1719
To use these images, set ``stackhpc_download_overcloud_host_images`` to true
1820
in ``etc/kayobe/stackhpc-overcloud-host-images.yml``.
1921

@@ -44,17 +46,16 @@ StackHPC Kayobe configuration provides configuration for some standard
4446
overcloud host images, built using the :kayobe-doc:`overcloud DIB
4547
<configuration/reference/overcloud-dib.html>` functionality of Kayobe.
4648

49+
FIXME:
50+
4751
The overcloud DIB configuration is provided in
48-
``etc/kayobe/stackhpc-overcloud-dib.yml``. It is not used by default, and must
49-
be actively opted into. This can be done as follows:
52+
``etc/kayobe/stackhpc-overcloud-dib.yml``. It is used by default, but may be
53+
opted out of as follows:
5054

5155
.. code-block:: yaml
5256
:caption: ``etc/kayobe/overcloud-dib.yml``
5357
54-
overcloud_dib_build_host_images: true
55-
56-
overcloud_dib_host_images:
57-
- "{{ stackhpc_overcloud_dib_host_image }}"
58+
overcloud_dib_build_host_images: false
5859
5960
The image name is configured via ``stackhpc_overcloud_dib_name``, and is
6061
``deployment_image`` by default.

doc/source/configuration/walled-garden.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ proxy:
6262
---
6363
# HTTP proxy URL (format: http(s)://[user:password@]proxy_name:port). By
6464
# default no proxy is used.
65+
# FIXME: Need to apply the fix from 0e66f0b3dd08b470acb593977dce7dcb611cf5e3
6566
http_proxy: "http://{{ admin_oc_net_name | net_ip(inventory_hostname=groups['seed'][0]) }}:3128"
6667
6768
# HTTPS proxy URL (format: http(s)://[user:password@]proxy_name:port). By
@@ -73,6 +74,7 @@ proxy:
7374
# docker_registry) | urlsplit('hostname') }}"] if docker_registry is set, or
7475
# ["127.0.0.1", "localhost"] otherwise. This is configured only if either
7576
# http_proxy or https_proxy is set.
77+
# FIXME: Need to apply the fix from 0e66f0b3dd08b470acb593977dce7dcb611cf5e3
7678
no_proxy:
7779
- "127.0.0.1"
7880
- "localhost"

doc/source/contributor/environments/ci-aio.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ Install package dependencies when on Ubuntu:
6161
.. parsed-literal::
6262
6363
sudo apt update
64+
# FIXME: Stop using virtualenv?
6465
sudo apt install -y python3-virtualenv
6566
6667
Clone the Kayobe and Kayobe configuration repositories (this one):

doc/source/contributor/environments/ci-builder.rst

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ Access the host via SSH.
2525

2626
Install package dependencies.
2727

28+
FIXME: Stop using virtualenv?
29+
2830
On CentOS:
2931

3032
.. parsed-literal::

etc/kayobe/environments/aufn-ceph/a-universe-from-nothing.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ $PULP_HOST
2424
EOF
2525

2626
# Install git and tmux.
27+
# FIXME: Drop virtualenv?
2728
if $(which dnf 2>/dev/null >/dev/null); then
2829
sudo dnf -y install git tmux python3-virtualenv
2930
else

etc/kayobe/kolla.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ kolla_build_customizations_common:
277277
ironic_inspector_pip_packages_append:
278278
- /additions/*
279279

280+
# FIXME
280281
kolla_build_customizations_rocky: # TODO: Check whether this is actually correct. It seems that it was previously being skipped for rocky
281282
base_yum_repo_files_remove:
282283
- proxysql.repo
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
# Overcloud host image versioning tags
33
# These images must be in SMS, since they are used by our AIO CI runners
4+
# FIXME: build & update tags
45
stackhpc_rocky_9_overcloud_host_image_version: "yoga-20230515T145140"
56
stackhpc_ubuntu_jammy_overcloud_host_image_version: "yoga-20230609T120720"

etc/kayobe/stackhpc-overcloud-host-images.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
# Release train overcloud host image sources
44

55
# Whether or not to download overcloud host images from Ark
6+
# TODO: Should we do it by default?
67
stackhpc_download_overcloud_host_images: false
78

89
# Whether or not to use images with MLNX_OFED installed (for deployment using

0 commit comments

Comments
 (0)