Fix bug 2058: Update lxd-credentials file

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

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 4cc1cfb..df35e7d 100755 (executable)
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -189,21 +189,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

diff --git a/installers/install_juju.sh b/installers/install_juju.sh
index 25bd238..a2d2dde 100755 (executable)
--- a/installers/install_juju.sh
+++ b/installers/install_juju.sh
@@ -80,21 +80,14 @@ clouds:
       ssl-hostname-verification: false
 EOF
     openssl req -nodes -new -x509 -keyout /tmp/.osm/client.key -out /tmp/.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 /tmp/.osm/client.crt | sed 's/^/        /'`
-    local client_key=`cat /tmp/.osm/client.key | sed 's/^/        /'`
-
     cat << EOF > $LXD_CREDENTIALS
 credentials:
   $OSM_VCA_CLOUDNAME:
     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: /tmp/.osm/client.crt
+      client-key: /tmp/.osm/client.key
 EOF
     lxc config trust add local: /tmp/.osm/client.crt
     juju add-cloud -c $OSM_STACK_NAME $OSM_VCA_CLOUDNAME $LXD_CLOUD --force