Fix bug 2142: Debug mode in Pebble Charms is not working

[osm/devops.git] / installers / charmed_install.sh

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 6d7e264..c6f770c 100755 (executable)
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -41,7 +41,7 @@ MODEL_NAME=osm
 
 OSM_BUNDLE=ch:osm
 OSM_HA_BUNDLE=ch:osm-ha
-CHARMHUB_CHANNEL=latest/edge
+CHARMHUB_CHANNEL=latest/stable
 unset TAG
 
 function check_arguments(){
@@ -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