X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharmed_install.sh;h=c6f770c9e7d305d94e2c8a89433e1602cc18ff7d;hb=7da7a3343ea03386d498eaa6b6a93eb3f770d6cd;hp=6d7e2643b26dc20b600f1a5e2d1545ac97706732;hpb=5d19ac25a6d26ef853399a46f6c2d190b5c2b803;p=osm%2Fdevops.git diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh index 6d7e2643..c6f770c9 100755 --- 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