Skip to content

Commit d97da57

Browse files
ci-aio: Removed --lvm option in deployment script
1 parent 5747c15 commit d97da57

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

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

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,11 @@ Run the setup script:
4242
4343
./automated-setup.sh
4444
45-
Adding the ``--lvm`` flag will also automatically set the LVM configuration,
46-
which can be modified in
47-
``etc/kayobe/environments/ci-aio/inventory/group_vars/controllers/lvm.yml``. A
48-
minimum 30GB root disk is recommended.
49-
5045
The script will pull the current version of Kayobe and this repository, and
5146
then run the manual setup steps below. The script can be easily edited to use
52-
a different branch of Kayobe or this repository.
47+
a different branch of Kayobe or this repository. The script will automatically
48+
determine whether your image is LVM based, if so, it will expand the volume sizes
49+
to allow ansible dependencies to install correctly.
5350

5451
Manual Setup
5552
============

etc/kayobe/environments/ci-aio/automated-setup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ cat << EOF | sudo tee -a /etc/hosts
66
10.205.3.187 pulp-server pulp-server.internal.sms-cloud
77
EOF
88

9-
if [ "${1-0}" != "--non-lvm" ]; then
9+
if [ sudo vgdisplay | grep -q lvm2 ]; then
1010
sudo lvextend -L 4G /dev/rootvg/lv_home -r || true
1111
sudo lvextend -L 4G /dev/rootvg/lv_tmp -r || true
1212
fi
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
features:
3+
- |
4+
Improvements to the ci-aio automated deployment script
5+
to allow the script to successfully run on LVM-based
6+
images.

0 commit comments

Comments
 (0)