Skip to content

Commit 7f1e8de

Browse files
Alex-WelshAlex-Welsh
authored
Various AUFN-related changes for Epoxy (#1734)
* Various AUFN-related changes for Epoxy * Post-review fixes
1 parent 9366718 commit 7f1e8de

19 files changed

+139
-35
lines changed

‎etc/kayobe/ansible/purge-command-not-found.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
name:
2626
- command-not-found
2727
- python3-command-not-found
28+
- python3-commandnotfound
2829
purge: true
2930
state: absent
3031
become: true

‎etc/kayobe/apt.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,21 @@ apt_keys:
5151
# Default is an empty list.
5252
stackhpc_apt_repositories:
5353
- url: "{{ stackhpc_repo_ubuntu_noble_url }}"
54+
name: ubuntu
5455
suites: "{{ ansible_facts.distribution_release }} {{ ansible_facts.distribution_release }}-updates {{ ansible_facts.distribution_release }}-backports"
5556
components: main restricted universe multiverse
57+
signed_by: /usr/share/keyrings/ubuntu-archive-keyring.gpg
5658
architecture: amd64
5759
required: true
5860
- url: "{{ stackhpc_repo_ubuntu_noble_security_url }}"
61+
name: ubuntu
5962
suites: "{{ ansible_facts.distribution_release }}-security"
6063
components: main restricted universe multiverse
64+
signed_by: /usr/share/keyrings/ubuntu-archive-keyring.gpg
6165
architecture: amd64
6266
required: true
6367
- url: "{{ stackhpc_repo_docker_ce_ubuntu_noble_url }}"
68+
name: ubuntu
6469
suites: "{{ ansible_facts.distribution_release }}"
6570
components: stable
6671
signed_by: docker.asc

‎etc/kayobe/bifrost.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -138,19 +138,19 @@
138138
kolla_bifrost_ipa_kernel_upstream_url: "{{ (stackhpc_ipa_image_url + '/ipa.kernel') if stackhpc_ipa_image_bifrost_enabled | bool }}"
139139

140140
# URL of checksum of Ironic Python Agent (IPA) kernel image.
141-
#kolla_bifrost_ipa_kernel_checksum_url:
141+
kolla_bifrost_ipa_kernel_checksum_url: "{{ kolla_bifrost_ipa_kernel_upstream_url }}.{{ kolla_bifrost_ipa_kernel_checksum_algorithm }}"
142142

143143
# Algorithm of checksum of Ironic Python Agent (IPA) kernel image.
144-
#kolla_bifrost_ipa_kernel_checksum_algorithm:
144+
kolla_bifrost_ipa_kernel_checksum_algorithm: sha256
145145

146146
# URL of Ironic Python Agent (IPA) ramdisk image.
147147
kolla_bifrost_ipa_ramdisk_upstream_url: "{{ (stackhpc_ipa_image_url + '/ipa.initramfs') if stackhpc_ipa_image_bifrost_enabled | bool }}"
148148

149149
# URL of checksum of Ironic Python Agent (IPA) ramdisk image.
150-
#kolla_bifrost_ipa_ramdisk_checksum_url:
150+
kolla_bifrost_ipa_ramdisk_checksum_url: "{{ kolla_bifrost_ipa_ramdisk_upstream_url }}.{{ kolla_bifrost_ipa_ramdisk_checksum_algorithm }}"
151151

152152
# Algorithm of checksum of Ironic Python Agent (IPA) ramdisk image.
153-
#kolla_bifrost_ipa_ramdisk_checksum_algorithm:
153+
kolla_bifrost_ipa_ramdisk_checksum_algorithm: sha256
154154

155155
###############################################################################
156156
# Inventory configuration.

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

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,23 @@ KAYOBE_BRANCH=stackhpc/2025.1
1414
KAYOBE_CONFIG_BRANCH=stackhpc/2025.1
1515
KAYOBE_ENVIRONMENT=aufn-ceph
1616

17+
if [[ ! -f $BASE_PATH/vault-pw ]]; then
18+
echo "Vault password file not found at $BASE_PATH/vault-pw"
19+
exit 1
20+
fi
21+
1722
# Install git and tmux.
1823
if $(which dnf 2>/dev/null >/dev/null); then
1924
sudo dnf -y install git tmux
2025
else
2126
sudo apt update
22-
sudo apt -y install git tmux gcc libffi-dev python3-dev python-is-python3
27+
sudo apt -y install git tmux gcc libffi-dev python3-dev python-is-python3 python3-pip python3.12-venv
2328
fi
2429

30+
export KAYOBE_VAULT_PASSWORD=$(cat $BASE_PATH/vault-pw)
31+
2532
# Disable the firewall.
26-
sudo systemctl is-enabled firewalld && sudo systemctl stop firewalld && sudo systemctl disable firewalld
33+
sudo systemctl is-enabled firewalld && sudo systemctl stop firewalld && sudo systemctl disable firewalld || true
2734

2835
# Disable SELinux both immediately and permanently.
2936
if $(which setenforce 2>/dev/null >/dev/null); then
@@ -32,7 +39,7 @@ if $(which setenforce 2>/dev/null >/dev/null); then
3239
fi
3340

3441
# Prevent sudo from performing DNS queries.
35-
echo 'Defaults !fqdn' | sudo tee /etc/sudoers.d/no-fqdn
42+
echo 'Defaults !fqdn' | sudo tee /etc/sudoers.d/no-fqdn
3643

3744
# Clone repositories
3845
cd $BASE_PATH
@@ -47,15 +54,15 @@ popd
4754
mkdir -p venvs
4855
pushd venvs
4956
if [[ ! -d kayobe ]]; then
50-
python3 -m venv kayobe
57+
python3.12 -m venv kayobe
5158
fi
5259
# NOTE: Virtualenv's activate and deactivate scripts reference an
5360
# unbound variable.
5461
set +u
5562
source kayobe/bin/activate
5663
set -u
5764
pip install -U pip
58-
pip install ../src/kayobe
65+
pip install -r ../src/kayobe-config/requirements.txt
5966
popd
6067

6168
# Activate environment

‎etc/kayobe/environments/aufn-ceph/compute.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
###############################################################################
3+
# Compute node configuration.
4+
5+
# User with which to access the computes via SSH during bootstrap, in order
6+
# to setup the Kayobe user account. Default is {{ os_distribution }}.
7+
compute_bootstrap_user: "{{ os_distribution if os_distribution == 'ubuntu' else 'cloud-user' }}"
8+
9+
###############################################################################
10+
# Compute node LVM configuration.
11+
12+
# List of compute volume groups. See mrlesmithjr.manage-lvm role for
13+
# format.
14+
compute_lvm_groups:
15+
- "{{ stackhpc_lvm_group_rootvg }}"

‎etc/kayobe/environments/aufn-ceph/controllers.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
###############################################################################
3+
# Controller node configuration.
4+
5+
# User with which to access the controllers via SSH during bootstrap, in order
6+
# to setup the Kayobe user account. Default is {{ os_distribution }}.
7+
controller_bootstrap_user: "{{ os_distribution if os_distribution == 'ubuntu' else 'cloud-user' }}"
8+
9+
###############################################################################
10+
# Controller node LVM configuration.
11+
12+
# List of controller volume groups. See mrlesmithjr.manage-lvm role for
13+
# format.
14+
controller_lvm_groups:
15+
- "{{ stackhpc_lvm_group_rootvg }}"

‎etc/kayobe/environments/aufn-ceph/inventory/group_vars/all/lvm.yml‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
---
2+
###############################################################################
3+
# StackHPC LVM Logical Volume (LV) configuration.
4+
5+
# StackHPC LVM lv_swap LV size.
6+
stackhpc_lvm_lv_swap_size: 120m
7+
8+
# StackHPC LVM lv_root LV size.
9+
stackhpc_lvm_lv_root_size: 1g
10+
11+
# StackHPC LVM lv_tmp LV size.
12+
stackhpc_lvm_lv_tmp_size: 1g
13+
14+
# StackHPC LVM lv_var LV size.
15+
stackhpc_lvm_lv_var_size: 2.5g
16+
17+
# StackHPC LVM lv_var_tmp LV size.
18+
stackhpc_lvm_lv_var_tmp_size: 1g
19+
20+
# StackHPC LVM lv_log LV size.
21+
stackhpc_lvm_lv_log_size: 1g
22+
23+
# StackHPC LVM lv_audit LV size.
24+
stackhpc_lvm_lv_audit_size: 120m
25+
26+
# StackHPC LVM lv_home LV size.
27+
stackhpc_lvm_lv_home_size: 1g

‎etc/kayobe/environments/aufn-ceph/stackhpc-ci.yml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
---
2+
###############################################################################
3+
# Kolla configuration.
4+
5+
# Docker namespace to use for Kolla images. Default is 'kolla'.
6+
kolla_docker_namespace: stackhpc-dev
7+
8+
###############################################################################
9+
# StackHPC configuration.
10+
11+
# Use AIO credentials for access to Ark
12+
# TODO: generate AUFN-specific credentials
13+
stackhpc_release_pulp_username: "skc-ci-aio"
14+
stackhpc_release_pulp_password: !vault |
15+
$ANSIBLE_VAULT;1.1;AES256
16+
31386366383365666135336331663635396237623139306362633933636233613765663731666338
17+
3633633736333936383439623066653663333964343234350a393137383537316164323837386437
18+
36613139323161643766666565643739373037623363636234343965343436653261326238393566
19+
3837336661653962340a316631366463623138623530373133336665376433633437306631383666
20+
30333461333535363433363336663664316634343432633766346564323833346663

‎etc/kayobe/environments/aufn-ceph/stackhpc.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ kolla_docker_namespace: stackhpc-dev
88
###############################################################################
99
# StackHPC configuration.
1010

11-
# Base URL of the StackHPC Test Pulp service.
12-
stackhpc_release_pulp_url: "http://pulp-server.internal.sms-cloud:8080"
13-
1411
pulp_username: admin
1512
pulp_password: 9e4bfa04-9d9d-493d-9473-ba92e4361dae
13+
14+
# Whether or not to download overcloud host images from Ark
15+
stackhpc_download_overcloud_host_images: true

‎etc/kayobe/environments/aufn-ceph/storage.yml‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
---
2+
###############################################################################
3+
# Storage node configuration.
4+
5+
# User with which to access the storage nodes via SSH during bootstrap, in
6+
# order to setup the Kayobe user account. Default is {{ os_distribution }}.
7+
storage_bootstrap_user: "{{ os_distribution if os_distribution == 'ubuntu' else 'cloud-user' }}"
8+
29
###############################################################################
310
# Storage node LVM configuration.
411

512
# List of storage volume groups. See mrlesmithjr.manage-lvm role for
613
# format.
7-
# storage_lvm_groups:
8-
9-
# Avoid undefined var which would result in 'LVM physical disks have not been configured' error
10-
storage_lvm_groups: []
14+
storage_lvm_groups:
15+
- "{{ stackhpc_lvm_group_rootvg }}"

0 commit comments

Comments
 (0)