Skip to content

Commit a419430

Browse files
committed
Improved AIO deployment script
The automated AIO deployment script has been improved in several ways: The password check is now the first command to run No user intervention is required to deploy to a non-lvm image The python3-venv package is installed on Ubuntu hosts The purge-command-not-found playbook is automatically run before host configuration
1 parent 11d036c commit a419430

File tree

1 file changed

+21
-18
lines changed

1 file changed

+21
-18
lines changed

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

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,39 +2,42 @@
22

33
set -eux
44

5+
if [[ ! -f $BASE_PATH/vault-pw ]]; then
6+
echo "Vault password file not found at $BASE_PATH/vault-pw"
7+
exit 1
8+
fi
9+
510
cat << EOF | sudo tee -a /etc/hosts
611
10.205.3.187 pulp-server pulp-server.internal.sms-cloud
712
EOF
813

9-
if sudo vgdisplay | grep -q lvm2; then
10-
sudo pvresize $(sudo pvs --noheadings | head -n 1 | awk '{print $1}')
11-
sudo lvextend -L 4G /dev/rootvg/lv_home -r || true
12-
sudo lvextend -L 4G /dev/rootvg/lv_tmp -r || true
13-
fi
14-
1514
BASE_PATH=~
1615
KAYOBE_BRANCH=stackhpc/yoga
1716
KAYOBE_CONFIG_BRANCH=stackhpc/yoga
1817

19-
if [[ ! -f $BASE_PATH/vault-pw ]]; then
20-
echo "Vault password file not found at $BASE_PATH/vault-pw"
21-
exit 1
18+
cd $BASE_PATH
19+
mkdir -p src
20+
pushd src
21+
[[ -d kayobe ]] || git clone https://github.com/stackhpc/kayobe.git -b $KAYOBE_BRANCH
22+
[[ -d kayobe-config ]] || git clone https://github.com/stackhpc/stackhpc-kayobe-config kayobe-config -b $KAYOBE_CONFIG_BRANCH
23+
popd
24+
25+
if sudo vgdisplay | grep -q lvm2; then
26+
sudo pvresize $(sudo pvs --noheadings | head -n 1 | awk '{print $1}')
27+
sudo lvextend -L 4G /dev/rootvg/lv_home -r || true
28+
sudo lvextend -L 4G /dev/rootvg/lv_tmp -r || true
29+
else
30+
rm $BASE_PATH/src/kayobe-config/etc/kayobe/environments/ci-aio/inventory/group_vars/controllers/lvm.yml
31+
sed -i -e '/controller_lvm_groups/,+2d' $BASE_PATH/src/kayobe-config/etc/kayobe/environments/ci-aio/controllers.yml
2232
fi
2333

2434
if type dnf; then
2535
sudo dnf -y install git
2636
else
2737
sudo apt update
28-
sudo apt -y install gcc git libffi-dev python3-dev python-is-python3
38+
sudo apt -y install gcc git libffi-dev python3-dev python-is-python3 python3-venv
2939
fi
3040

31-
cd $BASE_PATH
32-
mkdir -p src
33-
pushd src
34-
[[ -d kayobe ]] || git clone https://github.com/stackhpc/kayobe.git -b $KAYOBE_BRANCH
35-
[[ -d kayobe-config ]] || git clone https://github.com/stackhpc/stackhpc-kayobe-config kayobe-config -b $KAYOBE_CONFIG_BRANCH
36-
popd
37-
3841
mkdir -p venvs
3942
pushd venvs
4043
if [[ ! -d kayobe ]]; then
@@ -68,7 +71,7 @@ source kayobe-env --environment ci-aio
6871

6972
kayobe control host bootstrap
7073

71-
kayobe playbook run etc/kayobe/ansible/growroot.yml
74+
kayobe playbook run etc/kayobe/ansible/growroot.yml etc/kayobe/ansible/purge-command-not-found.yml
7275

7376
kayobe overcloud host configure
7477

0 commit comments

Comments
 (0)