wip

Author: Alex-Welsh

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

@@ -18,30 +18,31 @@ if sudo vgdisplay | grep -q lvm2; then
    sudo lvextend -L 4G /dev/rootvg/lv_tmp -r || true
 elif $KAYOBE_AIO_LVM; then
    echo "This environment is only designed for LVM images. If possible, switch to an LVM image.
-   
-   While it is not recommended, the environment can be adapted by:
-   Removing the lvm.yml group vars file in the ci-aio environment
-   Unsetting controller_lvm_groups in controllers.yml in the ci-aio environment
-   setting KAYOBE_AIO_LVM to false in this script."
+   To ignore this warning, set KAYOBE_AIO_LVM to false in this script."
    exit 1
 fi
 
 cat << EOF | sudo tee -a /etc/hosts
 10.205.3.187 pulp-server pulp-server.internal.sms-cloud
 EOF
 
+if type dnf; then
+    sudo dnf -y install git
+else
+    sudo apt update
+    sudo apt -y install gcc git libffi-dev python3-dev python-is-python3 python3-venv
+fi
+
 cd $BASE_PATH
 mkdir -p src
 pushd src
 [[ -d kayobe ]] || git clone https://github.com/stackhpc/kayobe.git -b $KAYOBE_BRANCH
 [[ -d kayobe-config ]] || git clone https://github.com/stackhpc/stackhpc-kayobe-config kayobe-config -b $KAYOBE_CONFIG_BRANCH
 popd
 
-if type dnf; then
-    sudo dnf -y install git
-else
-    sudo apt update
-    sudo apt -y install gcc git libffi-dev python3-dev python-is-python3 python3-venv
+if ! sudo vgdisplay | grep -q lvm2; then
+   rm $BASE_PATH/src/kayobe-config/etc/kayobe/environments/ci-aio/inventory/group_vars/controllers/lvm.yml
+   sed -i -e '/controller_lvm_groups/,+2d' $BASE_PATH/src/kayobe-config/etc/kayobe/environments/ci-aio/controllers.yml
 fi
 
 mkdir -p venvs