From: David Garcia <david.garcia@canonical.com>
Date: Mon, 27 Apr 2020 17:07:49 +0000 (+0200)
Subject: Add --controller, --lxd-cloud and --lxd-credentials in osm installer using charms
X-Git-Tag: release-v8.0-start~41
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fdevops.git;a=commitdiff_plain;h=42375216124ba603f798f774cfa97e10367489d4

Add --controller, --lxd-cloud and --lxd-credentials in osm installer using charms

- LXD Cloud: Takes a YAML file as a parameter with the LXD Cloud information
- LXD Credentials: Takes a YAML file as a parameter with the LXD Credentials information

Change-Id: I0f09e15eb00c0d64d91154d6d55c1ec3d12ee31a
Signed-off-by: David Garcia <david.garcia@canonical.com>
---

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 731282b6..dd26c57d 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -12,53 +12,69 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 #
+
+# set -eux
+
+K8S_CLOUD_NAME="k8s-cloud"
+
 function check_arguments(){
     while [ $# -gt 0 ] ; do
-      case $1 in
-        --bundle) BUNDLE="$2" ;;
-        --kubeconfig) KUBECFG="$2" ;;
-        --lxd-endpoint) LXDENDPOINT="$2" ;;
-        --lxd-cert) LXDCERT="$2" ;;
-	--microstack) MICROSTACK=y
-      esac
-      shift
+        case $1 in
+            --bundle) BUNDLE="$2" ;;
+            --kubeconfig) KUBECFG="$2" ;;
+            --controller) CONTROLLER="$2" ;;
+            --lxd-cloud) LXD_CLOUD="$2" ;;
+            --lxd-credentials) LXD_CREDENTIALS="$2" ;;
+            --microstack) MICROSTACK=y
+        esac
+        shift
     done
 
-    echo $BUNDLE $KUBECONFIG $LXDENDPOINT
+    # echo $BUNDLE $KUBECONFIG $LXDENDPOINT
 }
 function install_snaps(){
     sudo snap install juju --classic
-    if [ -z "$KUBECFG" ]; then sudo snap install microk8s --classic; fi
+    [ ! -v KUBECFG ] && sudo snap install microk8s --classic && sudo usermod -a -G microk8s ubuntu && mkdir -p ~/.kube && sudo chown -f -R `whoami` ~/.kube
 }
 
 function bootstrap_k8s_lxd(){
-    if [ -n "$KUBECFG" ]; then
-        echo "Using specified K8s"
-        cat $KUBECFG | juju add-k8s k8s-cluster --client
-        juju bootstrap k8s-cluster controller
+    [ -v CONTROLLER ] && ADD_K8S_OPTS="--controller ${CONTROLLER}" && CONTROLLER_NAME=$CONTROLLER
+    [ ! -v CONTROLLER ] && ADD_K8S_OPTS="--client" && BOOTSTRAP_NEEDED="yes" && CONTROLLER_NAME="controller"
+
+    if [ -v KUBECFG ]; then
+        cat $KUBECFG | juju add-k8s $K8S_CLOUD_NAME $ADD_K8S_OPTS
+        [ -v BOOTSTRAP_NEEDED ] && juju bootstrap $K8S_CLOUD_NAME $CONTROLLER_NAME
     else
-        sudo microk8s.enable storage dns
-        sudo usermod -a -G microk8s ubuntu
-        sg microk8s -c "juju bootstrap microk8s controller"
-    fi
+        sg microk8s -c "microk8s.enable storage dns"
 
-    if [ -n "$LXDENDPOINT" ]; then
-        if [ -n "$LXDCERT" ]; then
+        [ ! -v BOOTSTRAP_NEEDED ] && sg microk8s -c "microk8s.config" | juju add-k8s $K8S_CLOUD_NAME $ADD_K8S_OPTS
+        [ -v BOOTSTRAP_NEEDED ] && sg microk8s -c "juju bootstrap microk8s $CONTROLLER_NAME" && K8S_CLOUD_NAME=microk8s
+    fi
 
-            local server_cert=`cat $LXDCERT | sed 's/^/        /'`
-        else
+    if [ -v LXD_CLOUD ]; then
+        if [ ! -v LXD_CREDENTIALS ]; then
             echo "The installer needs the LXD server certificate if the LXD is external"
             exit 1
         fi
     else
         LXDENDPOINT=$DEFAULT_IP
-        lxd init --auto --network-address $LXDENDPOINT
-        lxc network set lxdbr0 ipv6.address none
-
-        local server_cert=`cat /var/lib/lxd/server.crt | sed 's/^/        /'`
-    fi
+        LXD_CLOUD=~/.osm/lxd-cloud.yaml
+        LXD_CREDENTIALS=~/.osm/lxd-credentials.yaml
+        # Apply sysctl production values for optimal performance
+        sudo cp /usr/share/osm-devops/installers/60-lxd-production.conf /etc/sysctl.d/60-lxd-production.conf
+        sudo sysctl --system
+        # Install LXD snap
+        sudo apt-get remove --purge -y liblxc1 lxc-common lxcfs lxd lxd-client
+        sudo snap install lxd
+        sudo apt-get install zfsutils-linux -y
+        # Configure LXD
+        sudo usermod -a -G lxd `whoami`
+        cat /usr/share/osm-devops/installers/lxd-preseed.conf | sed 's/^config: {}/config:\n  core.https_address: '$LXDENDPOINT':8443/' | sg lxd -c "lxd init --preseed"
+        sg lxd -c "lxd waitready"
+        DEFAULT_MTU=$(ip addr show $DEFAULT_IF | perl -ne 'if (/mtu\s(\d+)/) {print $1;}')
+        sg lxd -c "lxc profile device set default eth0 mtu $DEFAULT_MTU"
 
-    sudo cat << EOF > ~/.osm/lxd-cloud.yaml
+        cat << EOF > $LXD_CLOUD
 clouds:
   lxd-cloud:
     type: lxd
@@ -67,16 +83,15 @@ clouds:
     config:
       ssl-hostname-verification: false
 EOF
-    openssl req -nodes -new -x509 -keyout ~/.osm/private.key -out ~/.osm/publickey.crt -days 365 -subj "/C=FR/ST=Nice/L=Nice/O=ETSI/OU=OSM/CN=osm.etsi.org"
-
+        openssl req -nodes -new -x509 -keyout ~/.osm/client.key -out ~/.osm/client.crt -days 365 -subj "/C=FR/ST=Nice/L=Nice/O=ETSI/OU=OSM/CN=osm.etsi.org"
+        local server_cert=`cat /var/snap/lxd/common/lxd/server.crt | sed 's/^/        /'`
+        local client_cert=`cat ~/.osm/client.crt | sed 's/^/        /'`
+        local client_key=`cat ~/.osm/client.key | sed 's/^/        /'`
 
-    local client_cert=`cat ~/.osm/publickey.crt | sed 's/^/        /'`
-    local client_key=`cat ~/.osm/private.key | sed 's/^/        /'`
-
-    sudo cat << EOF > ~/.osm/lxd-credentials.yaml
+        cat << EOF > $LXD_CREDENTIALS
 credentials:
   lxd-cloud:
-    admin:
+    lxd-cloud:
       auth-type: certificate
       server-cert: |
 $server_cert
@@ -85,25 +100,26 @@ $client_cert
       client-key: |
 $client_key
 EOF
+        lxc config trust add local: ~/.osm/client.crt
+    fi
 
-   lxc config trust add local: ~/.osm/publickey.crt
-   juju add-cloud -c controller lxd-cloud ~/.osm/lxd-cloud.yaml --force
-   juju add-credential -c controller lxd-cloud -f ~/.osm/lxd-credentials.yaml
-   juju add-model test lxd-cloud
-
+    juju add-cloud -c $CONTROLLER_NAME lxd-cloud $LXD_CLOUD --force
+    juju add-credential -c $CONTROLLER_NAME lxd-cloud -f $LXD_CREDENTIALS
+    sg lxd -c "lxd waitready"
+    juju add-model test lxd-cloud || true
 }
 
 function deploy_charmed_osm(){
     create_overlay
     echo "Creating OSM model"
-    if [ -n "$KUBECFG" ]; then
-        juju add-model osm-on-k8s k8s-cluster
+    if [ -v KUBECFG ]; then
+        juju add-model osm $K8S_CLOUD_NAME
     else
-        sg microk8s -c "juju add-model osm-on-k8s microk8s"
+        sg microk8s -c "juju add-model osm $K8S_CLOUD_NAME"
     fi
     echo "Deploying OSM with charms"
-    echo $BUNDLE
-    if [ -n "$BUNDLE" ]; then
+    # echo $BUNDLE
+    if [ -v BUNDLE ]; then
         juju deploy $BUNDLE --overlay ~/.osm/vca-overlay.yaml
     else
         juju deploy osm --overlay ~/.osm/vca-overlay.yaml
@@ -111,7 +127,7 @@ function deploy_charmed_osm(){
     echo "Waiting for deployment to finish..."
     check_osm_deployed &> /dev/null
     echo "OSM with charms deployed"
-    sudo microk8s.enable ingress
+    sg microk8s -c "microk8s.enable ingress"
     juju config ui-k8s juju-external-hostname=osm.$DEFAULT_IP.xip.io
     juju expose ui-k8s
 }
@@ -119,11 +135,9 @@ function deploy_charmed_osm(){
 function check_osm_deployed() {
     while true
     do
-        pod_name=`sg microk8s -c "microk8s.kubectl -n osm-on-k8s get pods | grep ui-k8s | grep -v operator" | awk '{print $1}'
-`
-
-        if [[ `sg microk8s -c "microk8s.kubectl -n osm-on-k8s wait pod $pod_name --for condition=Ready"` ]]; then
-             if [[ `sg microk8s -c "microk8s.kubectl -n osm-on-k8s wait pod lcm-k8s-0 --for condition=Ready"` ]]; then
+        pod_name=`sg microk8s -c "microk8s.kubectl -n osm get pods | grep ui-k8s | grep -v operator" | awk '{print $1}'`
+        if [[ `sg microk8s -c "microk8s.kubectl -n osm wait pod $pod_name --for condition=Ready"` ]]; then
+            if [[ `sg microk8s -c "microk8s.kubectl -n osm wait pod lcm-k8s-0 --for condition=Ready"` ]]; then
                 break
             fi
         fi
@@ -132,25 +146,26 @@ function check_osm_deployed() {
 }
 
 function create_overlay() {
-    sudo snap install yq
-
-    local YQ="$SNAP/bin/yq"
+    sudo snap install jq
+    sudo apt install python3-pip -y
+    python3 -m pip install yq
+    PATH=$PATH:$HOME/.local/bin  # make yq command available
     local HOME=/home/$USER
-    local vca_user=$(cat $HOME/.local/share/juju/accounts.yaml | yq  r - controllers.controller.user)
-    local vca_password=$(cat $HOME/.local/share/juju/accounts.yaml | yq  r - controllers.controller.password)
-    local vca_host=$(cat $HOME/.local/share/juju/controllers.yaml | yq  r - controllers.controller.api-endpoints[0] | cut -d ":" -f 1)
-    local vca_port=$(cat $HOME/.local/share/juju/controllers.yaml | yq  r - controllers.controller.api-endpoints[0] | cut -d ":" -f 2)
+    local vca_user=$(cat $HOME/.local/share/juju/accounts.yaml | yq --arg CONTROLLER_NAME $CONTROLLER_NAME '.controllers[$CONTROLLER_NAME].user')
+    local vca_password=$(cat $HOME/.local/share/juju/accounts.yaml | yq --arg CONTROLLER_NAME $CONTROLLER_NAME '.controllers[$CONTROLLER_NAME].password')
+    local vca_host=$(cat $HOME/.local/share/juju/controllers.yaml | yq --arg CONTROLLER_NAME $CONTROLLER_NAME '.controllers[$CONTROLLER_NAME]["api-endpoints"][0]' | cut -d ":" -f 1 | cut -d "\"" -f 2)
+    local vca_port=$(cat $HOME/.local/share/juju/controllers.yaml | yq --arg CONTROLLER_NAME $CONTROLLER_NAME '.controllers[$CONTROLLER_NAME]["api-endpoints"][0]' | cut -d ":" -f 2 | cut -d "\"" -f 1)
     local vca_pubkey=\"$(cat $HOME/.local/share/juju/ssh/juju_id_rsa.pub)\"
     local vca_cloud="lxd-cloud"
     # Get the VCA Certificate
-    local vca_cacert=$(cat $HOME/.local/share/juju/controllers.yaml | yq  r - controllers.controller.ca-cert | base64 | tr -d \\n)
+    local vca_cacert=$(cat $HOME/.local/share/juju/controllers.yaml | yq --arg CONTROLLER_NAME $CONTROLLER_NAME '.controllers[$CONTROLLER_NAME]["ca-cert"]' | base64 | tr -d \\n)
 
     # Calculate the default route of this machine
     local DEFAULT_IF=`route -n |awk '$1~/^0.0.0.0/ {print $8}'`
     local vca_apiproxy=`ip -o -4 a |grep ${DEFAULT_IF}|awk '{split($4,a,"/"); print a[1]}'`
 
     # Generate a new overlay.yaml, overriding any existing one
-    sudo cat << EOF > /tmp/vca-overlay.yaml
+    cat << EOF > /tmp/vca-overlay.yaml
 applications:
   lcm-k8s:
     options:
@@ -169,8 +184,8 @@ applications:
       vca_host: $vca_host
       vca_cacert: $vca_cacert
 EOF
-   sudo cp /tmp/vca-overlay.yaml ~/.osm/
-   OSM_VCA_HOST=$vca_host
+    mv /tmp/vca-overlay.yaml ~/.osm/
+    OSM_VCA_HOST=$vca_host
 }
 
 function install_osmclient() {
@@ -202,40 +217,40 @@ function install_microstack() {
     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
+    --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 yaml | yq r - applications.nbi-k8s.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}'
+    --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}'
 }
 
 DEFAULT_IF=`route -n |awk '$1~/^0.0.0.0/ {print $8}'`
 DEFAULT_IP=`ip -o -4 a |grep ${DEFAULT_IF}|awk '{split($4,a,"/"); print a[1]}'`
 
 check_arguments $@
-mkdir ~/.osm
+mkdir -p ~/.osm
 install_snaps
 bootstrap_k8s_lxd
 deploy_charmed_osm
-create_iptables
+[ ! -v CONTROLLER ] && create_iptables
 install_osmclient
-if [ -n "$MICROSTACK" ]; then
+if [ -v MICROSTACK ]; then
     install_microstack
 fi
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index f4c06cf3..613f5108 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -246,7 +246,7 @@ function install_lxd() {
 
     # Install LXD snap
     sudo apt-get remove --purge -y liblxc1 lxc-common lxcfs lxd lxd-client
-    sudo snap install lxd --channel=3.0/stable
+    sudo snap install lxd
 
     # Configure LXD
     sudo usermod -a -G lxd `whoami`