From a4e47e535cdbbac7a2c5040e3cb18755cc151872 Mon Sep 17 00:00:00 2001
From: Gulsum Atici <gulsum.atici@canonical.com>
Date: Wed, 7 Jun 2023 02:45:02 +0300
Subject: [PATCH] Updating README.md
Signed-off-by: Gulsum Atici <gulsum.atici@canonical.com>
---
Hackfest_Demos/OSM-15/setup_scripts/README.md | 39 ++++++++++---------
.../OSM-15/setup_scripts/common-vars | 4 +-
.../setup_scripts/create-openstack-vm.sh | 2 +-
.../OSM-15/setup_scripts/run-full-setup.sh | 9 ++---
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/Hackfest_Demos/OSM-15/setup_scripts/README.md b/Hackfest_Demos/OSM-15/setup_scripts/README.md
index 8e0dd10..9a4a90a 100644
--- a/Hackfest_Demos/OSM-15/setup_scripts/README.md
+++ b/Hackfest_Demos/OSM-15/setup_scripts/README.md
@@ -3,30 +3,32 @@
First, check the common-vars for the following:
```
-APT_PROXY=http://172.21.1.1:3142
-FLAVOR=m1.xlarge
-PROJECT=f15ab4f845dc4052811fce96a3676ac8
-SUBNET=172.21.248
+APT_PROXY=http://172.21.1.1.3142
+FLAVOR=test_flavor_fix
+KEY_NAME=hackfest
+NETWORK=osm-ext
+FOCAL=ubuntu20.04
```
APT_PROXY: the address of a caching web proxy for installing packages
FLAVOR: the flavour of the new VM to launch. Must have at least 4 CPUs, 8 GB RAM and 60 GB Disk.
-PROJECT: The project ID in which to launch the new VM
-SUBNET: the first three octets of the subnet to use. IP addresses will be allocated from this subnet, starting with .101 - .199
+KEY_NAME: Key to connect VMs
+NETWORK: IP addresses will be allocated from this network, this network is management network of OSM instance
+FOCAL: Image to install VMs
-
-### Initial Configuration
-This script updates apt, upgrades the system to the latest 20.04 and installs remote desktop software
+### Create VMs
+This script creates the VMs in required project
```
-./run-vm-initial-setup.sh
+./run-create-openstack-vm.sh
```
-### Install Microk8s
-This script will configure the Microk8s VM launched by the create-openstack-user-and-project script.
+### Initial Configuration
+This script updates apt, upgrades the system to the latest 20.04 and installs remote desktop software
+
```
-./run-microk8s-setup.sh
+./run-vm-initial-setup.sh
```
@@ -38,7 +40,7 @@ This script downloads the installer and runs it. It also sets the OSM admin pas
```
### Add VIM and K8s Cluster
-
+Add VIM and ks8cluster to OSM instance
```
./run-osm-vim-k8scluster-add.sh
```
@@ -46,10 +48,9 @@ This script downloads the installer and runs it. It also sets the OSM admin pas
## Full Flow
```
-./run-create-openstack-user-and-project.sh 1 1
-./run-vm-setup.sh 1 1
-./run-microk8s-setup.sh 1 1
-./run-install-osm.sh 1 1
-./run-osm-vim-k8scluster-add.sh 1 1
+./run-create-openstack-user-and-project.sh
+./run-vm-initial-setup.sh
+./run-install-osm.sh
+./run-osm-vim-k8scluster-add.sh
```
diff --git a/Hackfest_Demos/OSM-15/setup_scripts/common-vars b/Hackfest_Demos/OSM-15/setup_scripts/common-vars
index 97d42b1..384bf86 100644
--- a/Hackfest_Demos/OSM-15/setup_scripts/common-vars
+++ b/Hackfest_Demos/OSM-15/setup_scripts/common-vars
@@ -16,7 +16,7 @@ if [ ! -z ${DEBUG} ]; then
fi
START=5
-MAX=6
+MAX=10
if [ ! -z $2 ] ; then
START=$1
@@ -28,7 +28,7 @@ fi
# ETSI VIM ADMIN_DOMAIN=default
APT_PROXY=http://172.21.1.1.3142
-FLAVOR=test_flavor_fix
+FLAVOR=osm.sanity
KEY_NAME=hackfest
NETWORK=osm-ext
FOCAL=ubuntu20.04
diff --git a/Hackfest_Demos/OSM-15/setup_scripts/create-openstack-vm.sh b/Hackfest_Demos/OSM-15/setup_scripts/create-openstack-vm.sh
index 6c219e8..66079a4 100755
--- a/Hackfest_Demos/OSM-15/setup_scripts/create-openstack-vm.sh
+++ b/Hackfest_Demos/OSM-15/setup_scripts/create-openstack-vm.sh
@@ -8,7 +8,7 @@ PARTICIPANT=${1}
VM_NAME=`expr charmedosm-${PARTICIPANT}`
echo "Creating public port"
# This port gets created as the admin
-openstack port create --security-group default --network osm-ext $VM_NAME
+openstack port create --security-group default --network $NETWORK $VM_NAME
wait
diff --git a/Hackfest_Demos/OSM-15/setup_scripts/run-full-setup.sh b/Hackfest_Demos/OSM-15/setup_scripts/run-full-setup.sh
index 4c6f085..0756d6f 100755
--- a/Hackfest_Demos/OSM-15/setup_scripts/run-full-setup.sh
+++ b/Hackfest_Demos/OSM-15/setup_scripts/run-full-setup.sh
@@ -3,11 +3,10 @@ echo $0 started at $(date)
. ./common-vars
-#./run-create-openstack-vm.sh $@
+./run-create-openstack-vm.sh $@
./run-vm-initial-setup.sh $@
-#./run-microk8s-setup.sh $@ &
-#./run-install-osm.sh $@
-#wait
-#./run-osm-vim-k8scluster-add.sh $@
+./run-install-osm.sh $@
+wait
+./run-osm-vim-k8scluster-add.sh $@
echo $0 $@ complete at $(date)
\ No newline at end of file
--
GitLab