Skip to content

Commit c5a8048

Browse files
committed
Bootstrap for CHPC lab
1 parent 9b52c31 commit c5a8048

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

a-seed-from-nothing.sh

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
SECONDS=0
55

66
# Cloud User: cloud-user (CentOS) or ubuntu?
7-
CLOUD_USER=cloud-user
7+
CLOUD_USER=ubuntu
88

99
ENABLE_OVN=true
1010

@@ -16,6 +16,7 @@ echo "[INFO] Given docker registry IP: $registry_ip"
1616
# Disable the firewall.
1717
if [[ "${CLOUD_USER}" = "ubuntu" ]]
1818
then
19+
grep -q $HOSTNAME /etc/hosts || (echo "$(ip r | grep -o '^default via.*src [0-9.]*' | awk '{print $NF}') $HOSTNAME" | sudo tee -a /etc/hosts)
1920
dpkg -l ufw && sudo systemctl is-enabled ufw && sudo systemctl stop ufw && sudo systemctl disable ufw
2021
else
2122
rpm -q firewalld && sudo systemctl is-enabled firewalld && sudo systemctl stop firewalld && sudo systemctl disable firewalld
@@ -88,7 +89,8 @@ fi
8889

8990
# Clone Kayobe.
9091
cd $HOME
91-
[[ -d kayobe ]] || git clone https://opendev.org/openstack/kayobe.git -b stable/yoga
92+
#[[ -d kayobe ]] || git clone https://opendev.org/openstack/kayobe.git -b stable/yoga
93+
[[ -d kayobe ]] || git clone https://github.com/oneswig/kayobe -b oneswig/yoga
9294
cd kayobe
9395

9496
# Bump the provisioning time - it can be lengthy on virtualised storage
@@ -100,7 +102,8 @@ sed -i.bak 's%^[# ]*wait_active_timeout:.*% wait_active_timeout: 5000%' ~/kay
100102
# Clone this Kayobe configuration.
101103
mkdir -p config/src
102104
cd config/src/
103-
[[ -d kayobe-config ]] || git clone https://github.com/stackhpc/a-universe-from-nothing.git -b stable/yoga kayobe-config
105+
#[[ -d kayobe-config ]] || git clone https://github.com/stackhpc/a-universe-from-nothing.git -b stable/yoga kayobe-config
106+
[[ -d kayobe-config ]] || git clone https://github.com/stackhpc/a-universe-from-nothing.git -b yoga-XL kayobe-config
104107

105108
# Set default registry name to the one we just created
106109
sed -i.bak 's/^docker_registry.*/docker_registry: '$registry_ip':4000/' kayobe-config/etc/kayobe/docker.yml
@@ -145,6 +148,12 @@ if ! ./dev/seed-deploy.sh; then
145148
./dev/seed-deploy.sh
146149
fi
147150

151+
# Run TENKS
152+
cd ~/kayobe
153+
source dev/environment-setup.sh
154+
export TENKS_CONFIG_PATH=config/src/kayobe-config/tenks.yml
155+
./dev/tenks-deploy-overcloud.sh ./tenks
156+
148157
# Duration
149158
duration=$SECONDS
150159
echo "[INFO] $(($duration / 60)) minutes and $(($duration % 60)) seconds elapsed."

pull-retag-push-images.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -e
66
SECONDS=0
77

88
# DISTRO: CentOS or Ubuntu?
9-
DISTRO=centos
9+
DISTRO=ubuntu
1010

1111
if [[ "${DISTRO}" = "ubuntu" ]]
1212
then
@@ -25,7 +25,7 @@ else
2525
cat << "EOF" | sudo tee /etc/yum.repos.d/docker-ce.repo
2626
[docker-ce-stable]
2727
name=Docker CE Stable - $basearch
28-
baseurl=https://download.docker.com/linux/centos/8/$basearch/stable
28+
baseurl=https://download.docker.com/linux/centos/9/$basearch/stable
2929
enabled=1
3030
gpgcheck=1
3131
gpgkey=https://download.docker.com/linux/centos/gpg

0 commit comments

Comments
 (0)