X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharmed_install.sh;h=fb50a7ebc3681adf928c7c8d9ec3d993d32d04af;hb=refs%2Fheads%2Fv12.0;hp=6d7e2643b26dc20b600f1a5e2d1545ac97706732;hpb=5d19ac25a6d26ef853399a46f6c2d190b5c2b803;p=osm%2Fdevops.git

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 6d7e2643..fb50a7eb 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -17,11 +17,11 @@
 
 LXD_VERSION=4.0
 JUJU_VERSION=2.9
-JUJU_AGENT_VERSION=2.9.29
+JUJU_AGENT_VERSION=2.9.43
 K8S_CLOUD_NAME="k8s-cloud"
 KUBECTL="microk8s.kubectl"
-MICROK8S_VERSION=1.23
-OSMCLIENT_VERSION=latest
+MICROK8S_VERSION=1.26
+OSMCLIENT_VERSION=12.0
 IMAGES_OVERLAY_FILE=~/.osm/images-overlay.yaml
 PASSWORD_OVERLAY_FILE=~/.osm/password-overlay.yaml
 PATH=/snap/bin:${PATH}
@@ -41,7 +41,7 @@ MODEL_NAME=osm
 
 OSM_BUNDLE=ch:osm
 OSM_HA_BUNDLE=ch:osm-ha
-CHARMHUB_CHANNEL=latest/edge
+CHARMHUB_CHANNEL=12.0/stable
 unset TAG
 
 function check_arguments(){
@@ -133,7 +133,7 @@ EOF
     else
         sg ${KUBEGRP} -c "echo ${DEFAULT_IP}-${DEFAULT_IP} | microk8s.enable metallb"
         sg ${KUBEGRP} -c "microk8s.enable ingress"
-        sg ${KUBEGRP} -c "microk8s.enable storage dns"
+        sg ${KUBEGRP} -c "microk8s.enable hostpath-storage dns"
         TIME_TO_WAIT=30
         start_time="$(date -u +%s)"
         while true
@@ -192,21 +192,14 @@ clouds:
       ssl-hostname-verification: false
 EOF
               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/^/        /'`
-
               cat << EOF > $LXD_CREDENTIALS
 credentials:
   lxd-cloud:
     lxd-cloud:
       auth-type: certificate
-      server-cert: |
-$server_cert
-      client-cert: |
-$client_cert
-      client-key: |
-$client_key
+      server-cert: /var/snap/lxd/common/lxd/server.crt
+      client-cert: ~/.osm/client.crt
+      client-key: ~/.osm/client.key
 EOF
               lxc config trust add local: ~/.osm/client.crt
           fi