projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fixing charm name typos
[osm/devops.git]
/
installers
/
install_juju.sh
diff --git
a/installers/install_juju.sh
b/installers/install_juju.sh
index
a546637
..
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"
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
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
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=""
DEBUG_INSTALL=""
INSTALL_CACHELXDIMAGES=""
INSTALL_NOJUJU=""
-JUJU_AGENT_VERSION=2.9.2
2
+JUJU_AGENT_VERSION=2.9.2
9
JUJU_VERSION=2.9
OSM_DEVOPS=
OSM_STACK_NAME=osm
JUJU_VERSION=2.9
OSM_DEVOPS=
OSM_STACK_NAME=osm