projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing jq step
[osm/devops.git]
/
installers
/
charmed_install.sh
diff --git
a/installers/charmed_install.sh
b/installers/charmed_install.sh
index
6d7e264
..
f68f395
100755
(executable)
--- a/
installers/charmed_install.sh
+++ b/
installers/charmed_install.sh
@@
-21,7
+21,7
@@
JUJU_AGENT_VERSION=2.9.29
K8S_CLOUD_NAME="k8s-cloud"
KUBECTL="microk8s.kubectl"
MICROK8S_VERSION=1.23
K8S_CLOUD_NAME="k8s-cloud"
KUBECTL="microk8s.kubectl"
MICROK8S_VERSION=1.23
-OSMCLIENT_VERSION=
latest
+OSMCLIENT_VERSION=
12.0
IMAGES_OVERLAY_FILE=~/.osm/images-overlay.yaml
PASSWORD_OVERLAY_FILE=~/.osm/password-overlay.yaml
PATH=/snap/bin:${PATH}
IMAGES_OVERLAY_FILE=~/.osm/images-overlay.yaml
PASSWORD_OVERLAY_FILE=~/.osm/password-overlay.yaml
PATH=/snap/bin:${PATH}
@@
-41,7
+41,7
@@
MODEL_NAME=osm
OSM_BUNDLE=ch:osm
OSM_HA_BUNDLE=ch:osm-ha
OSM_BUNDLE=ch:osm
OSM_HA_BUNDLE=ch:osm-ha
-CHARMHUB_CHANNEL=
latest/edg
e
+CHARMHUB_CHANNEL=
12.0/stabl
e
unset TAG
function check_arguments(){
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"
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
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
EOF
lxc config trust add local: ~/.osm/client.crt
fi