X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Finstall_juju.sh;h=26de8ddfdec84d3709d02758a52b8e4374f5311e;hb=7735f6a86e290c0c15c4f41f5f81b5930b14cc73;hp=25bd2389deb793ceab74946110059b276c7d00a2;hpb=49a203d30b14d912fc641dd2ed3bf5e707348571;p=osm%2Fdevops.git diff --git a/installers/install_juju.sh b/installers/install_juju.sh index 25bd2389..26de8ddf 100755 --- 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 @@ -131,7 +124,7 @@ function juju_createproxy() { DEBUG_INSTALL="" INSTALL_CACHELXDIMAGES="" INSTALL_NOJUJU="" -JUJU_AGENT_VERSION=2.9.29 +JUJU_AGENT_VERSION=2.9.35 JUJU_VERSION=2.9 OSM_DEVOPS= OSM_STACK_NAME=osm