Skip to content

Commit 8554863

Browse files
add growroot
1 parent 4774005 commit 8554863

File tree

2 files changed

+31
-13
lines changed

2 files changed

+31
-13
lines changed

.github/workflows/package-build-ofed.yml

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,33 @@ jobs:
8484
EOF
8585
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
8686

87+
- name: Output image tag
88+
id: image_tag
89+
run: |
90+
echo image_tag=$(grep stackhpc_rocky_9_overcloud_host_image_version: etc/kayobe/pulp-host-image-versions.yml | awk '{print $2}') >> $GITHUB_OUTPUT
91+
working-directory: ${{ github.workspace }}/src/kayobe-config
92+
93+
# Use the image override if set, otherwise use overcloud-os_distribution-os_release-tag
94+
- name: Output image name
95+
id: image_name
96+
run: |
97+
echo image_name=overcloud-rocky-9-${{ steps.image_tag.outputs.image_tag }} >> $GITHUB_OUTPUT
98+
8799
- name: Generate terraform.tfvars
88100
run: |
89101
cat << EOF > terraform.tfvars
90102
ssh_public_key = "id_rsa.pub"
91-
ssh_username = "ubuntu"
103+
ssh_username = "cloud-user"
92104
aio_vm_name = "skc-ipa-image-builder"
93-
# Must be an Ubuntu Jammy host to successfully build all images
94-
# This MUST NOT be an LVM image. It can cause confusing conficts with the built image.
95-
aio_vm_image = "Ubuntu-22.04"
105+
aio_vm_image = "${{ env.VM_IMAGE }}"
96106
aio_vm_flavor = "en1.medium"
97107
aio_vm_network = "stackhpc-ci"
98108
aio_vm_subnet = "stackhpc-ci"
99109
aio_vm_interface = "ens3"
100110
EOF
101111
working-directory: ${{ github.workspace }}/src/kayobe-config/terraform/aio
112+
env:
113+
VM_IMAGE: ${{ steps.image_name.outputs.image_name }}
102114

103115
- name: Terraform Plan
104116
run: terraform plan
@@ -170,26 +182,32 @@ jobs:
170182
source src/kayobe-config/kayobe-env --environment ci-builder &&
171183
kayobe control host bootstrap
172184
173-
- name: Configure the seed host (Builder VM)
185+
- name: Growpart
174186
run: |
175187
source venvs/kayobe/bin/activate &&
176188
source src/kayobe-config/kayobe-env --environment ci-builder &&
177-
kayobe seed host configure -e seed_bootstrap_user=ubuntu --skip-tags network,apt,docker,docker-registry
189+
kayobe playbook run src/kayobe-config/etc/kayobe/ansible/growroot.yml \
190+
-e growroot_group="seed" \
191+
-e seed_bootstrap_user="cloud-user"
192+
env:
193+
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
178194

179-
- name: Install dependencies
195+
- name: Configure the seed host (Builder VM)
180196
run: |
181197
source venvs/kayobe/bin/activate &&
182198
source src/kayobe-config/kayobe-env --environment ci-builder &&
183-
kayobe seed host command run \
184-
--command "sudo apt update && sudo apt -y install gcc git libffi-dev python3-dev python-is-python3 python3-venv" --show-output
199+
kayobe seed host configure \
200+
-e seed_bootstrap_user=cloud-user \
201+
--skip-tags network,apt,docker,docker-registry
185202
env:
186203
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
187204

188-
- name: Resize root disk
205+
- name: Install dependencies
189206
run: |
190207
source venvs/kayobe/bin/activate &&
191208
source src/kayobe-config/kayobe-env --environment ci-builder &&
192-
kayobe seed host command run --command "resize2fs $(findmnt -n -o SOURCE /)" --show-output --become
209+
kayobe seed host command run \
210+
--command "sudo apt update && sudo apt -y install gcc git libffi-dev python3-dev python-is-python3 python3-venv" --show-output
193211
env:
194212
KAYOBE_VAULT_PASSWORD: ${{ secrets.KAYOBE_VAULT_PASSWORD }}
195213

etc/kayobe/environments/ci-builder/inventory/group_vars/seed/lvm.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ stackhpc_lvm_group_rootvg_lvs_extra:
1010
stackhpc_lvm_lv_swap_size: 500m
1111

1212
# StackHPC LVM lv_root LV size.
13-
stackhpc_lvm_lv_root_size: 2g
13+
stackhpc_lvm_lv_root_size: 20g
1414

1515
# StackHPC LVM lv_tmp LV size.
1616
stackhpc_lvm_lv_tmp_size: 2g
@@ -31,4 +31,4 @@ stackhpc_lvm_lv_audit_size: 250m
3131
stackhpc_lvm_lv_home_size: 2g
3232

3333
# StackHPC LVM lv_docker LV size.
34-
stackhpc_lvm_lv_docker_size: 95%FREE
34+
stackhpc_lvm_lv_docker_size: 2g

0 commit comments

Comments
 (0)