X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharmed_install.sh;h=e215ef2bc78d9662e152b803e3d654b2acdf53c4;hb=e2dd10f7fab0315302fd00869d59ae1368e36757;hp=5b4d3b22d3e226d9fe1d678b438edcb980ea9e5a;hpb=b50dabe0ff0ba74ec6fa9566fc1e509e6866c1e4;p=osm%2Fdevops.git

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 5b4d3b22..e215ef2b 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -15,7 +15,7 @@
 
 # set -eux
 
-JUJU_AGENT_VERSION=2.8.6
+JUJU_AGENT_VERSION=2.8.8
 K8S_CLOUD_NAME="k8s-cloud"
 KUBECTL="microk8s.kubectl"
 MICROK8S_VERSION=1.19
@@ -51,7 +51,7 @@ function check_arguments(){
 function install_snaps(){
     if [ ! -v KUBECFG ]; then
         sudo snap install microk8s --classic --channel=${MICROK8S_VERSION}/stable
-        cat /var/snap/microk8s/current/args/kube-apiserver | grep advertise-address || (
+        sudo cat /var/snap/microk8s/current/args/kube-apiserver | grep advertise-address || (
                 echo "--advertise-address $DEFAULT_IP" | sudo tee -a /var/snap/microk8s/current/args/kube-apiserver
                 microk8s.stop
                 microk8s.start
@@ -392,7 +392,7 @@ applications:
       image: ${REGISTRY_URL}opensourcemano/pol:$TAG ${REGISTRY_CREDENTIALS}
   pla:
     options:
-      image: ${REGISTRY_URL}opensourcemano/pla:$TAG ${REGISTRY_CREDENTIALS}
+      image: ${REGISTRY_URL}opensourcemano/pla:8 ${REGISTRY_CREDENTIALS}
   ng-ui:
     resources:
       image: /tmp/ng_ui_registry.yaml
@@ -443,32 +443,52 @@ function add_local_k8scluster() {
 }
 
 function install_microstack() {
-    sudo snap install microstack --classic --beta
-    sudo microstack.init --auto
-    wget https://cloud-images.ubuntu.com/releases/16.04/release/ubuntu-16.04-server-cloudimg-amd64-disk1.img -P ~/.osm/
-    microstack.openstack image create \
-    --public \
-    --disk-format qcow2 \
-    --container-format bare \
-    --file ~/.osm/ubuntu-16.04-server-cloudimg-amd64-disk1.img \
-    ubuntu1604
-    ssh-keygen -t rsa -N "" -f ~/.ssh/microstack
-    microstack.openstack keypair create --public-key ~/.ssh/microstack.pub microstack
-    export OSM_HOSTNAME=`juju status --format json | jq -rc '.applications."nbi".address'`
-    osm vim-create --name microstack-site \
-    --user admin \
-    --password keystone \
-    --auth_url http://10.20.20.1:5000/v3 \
-    --tenant admin \
-    --account_type openstack \
-    --config='{security_groups: default,
-        keypair: microstack,
-        project_name: admin,
-        user_domain_name: default,
-        region_name: microstack,
-        insecure: True,
-        availability_zone: nova,
-    version: 3}'
+    # Install and init microstack
+    sudo snap install microstack --channel beta --devmode
+    sudo snap set microstack config.network.ports.dashboard=8080
+    sudo microstack.init --auto --control
+
+    # Basic configuration
+    microstack.openstack network create --enable --no-share osm-ext
+    microstack.openstack subnet create osm-ext-subnet --network osm-ext --dns-nameserver 8.8.8.8 --subnet-range 172.16.0.0/24
+    microstack.openstack router create external-router
+    microstack.openstack router add subnet external-router osm-ext-subnet
+    microstack.openstack router set --external-gateway external external-router
+    for i in $(microstack.openstack security group list | awk '/default/{ print $2 }'); do
+        microstack.openstack security group rule create $i --protocol icmp --remote-ip 0.0.0.0/0
+        microstack.openstack security group rule create $i --protocol tcp --remote-ip 0.0.0.0/0
+    done
+    KEYPAIR_PATH=~/.ssh/microstack
+    if ! test -f $KEYPAIR_PATH; then
+        echo "Generating ssh keypair for microstack"
+        ssh-keygen -t rsa -N "" -f $KEYPAIR_PATH
+    fi
+    microstack.openstack keypair create --public-key $KEYPAIR_PATH.pub microstack
+
+    # Add xenial, bionic, and focal images to microstack
+    echo "curl https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img | microstack.openstack image create --public --container-format=bare --disk-format=qcow2 ubuntu16.04"
+    echo "curl https://cloud-images.ubuntu.com/bionic/current/bionic-server-cloudimg-amd64.img | microstack.openstack image create --public --container-format=bare --disk-format=qcow2 ubuntu18.04"
+    echo "curl https://cloud-images.ubuntu.com/focal/current/focal-server-cloudimg-amd64.img | microstack.openstack image create --public --container-format=bare --disk-format=qcow2 ubuntu20.04"
+
+    # Load ENV variables
+    . /var/snap/microstack/common/etc/microstack.rc
+    osm vim-create  --name microstack \
+                    --user "$OS_USERNAME" \
+                    --password "$OS_PASSWORD" \
+                    --auth_url "$OS_AUTH_URL/v3" \
+                    --tenant "$OS_USERNAME" \
+                    --account_type openstack \
+                    --config='{
+                        use_floating_ip: True,
+                        management_network_name: osm-ext,
+                        keypair: microstack,
+                        project_name: admin,
+                        user_domain_name: default,
+                        region_name: microstack,
+                        insecure: True,
+                        availability_zone: nova,
+                        version: 3
+                    }'
 }
 
 DEFAULT_IF=`ip route list match 0.0.0.0 | awk '{print $5}'`
@@ -480,7 +500,7 @@ install_snaps
 bootstrap_k8s_lxd
 deploy_charmed_osm
 install_osmclient
-OSM_HOSTNAME=$(juju config nbi site_url | sed "s/http.*\?:\/\///"):443
+export OSM_HOSTNAME=$(juju config nbi site_url | sed "s/http.*\?:\/\///"):443
 add_local_k8scluster
 
 if [ -v MICROSTACK ]; then