projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adding logging around repo
[osm/devops.git]
/
installers
/
full_install_osm.sh
diff --git
a/installers/full_install_osm.sh
b/installers/full_install_osm.sh
index
d9f0995
..
22cba8d
100755
(executable)
--- a/
installers/full_install_osm.sh
+++ b/
installers/full_install_osm.sh
@@
-492,21
+492,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
@@
-879,6
+872,7
@@
data:
#installs metallb from helm
function install_helm_metallb() {
#installs metallb from helm
function install_helm_metallb() {
+ METALLB_VERSION="0.11.0"
METALLB_IP_RANGE=$DEFAULT_IP/32
echo "configInline:
address-pools:
METALLB_IP_RANGE=$DEFAULT_IP/32
echo "configInline:
address-pools:
@@
-888,7
+882,7
@@
function install_helm_metallb() {
- $METALLB_IP_RANGE" | sudo tee -a $OSM_DOCKER_WORK_DIR/metallb-config.yaml
helm repo add metallb https://metallb.github.io/metallb
helm repo update
- $METALLB_IP_RANGE" | sudo tee -a $OSM_DOCKER_WORK_DIR/metallb-config.yaml
helm repo add metallb https://metallb.github.io/metallb
helm repo update
- helm install --create-namespace --namespace metallb-system metallb metallb/metallb -f $OSM_DOCKER_WORK_DIR/metallb-config.yaml
+ helm install --create-namespace --namespace metallb-system metallb metallb/metallb -
-version ${METALLB_VERSION} -
f $OSM_DOCKER_WORK_DIR/metallb-config.yaml
}
#checks openebs and metallb readiness
}
#checks openebs and metallb readiness
@@
-1913,9
+1907,6
@@
if [ -n "$CHARMED" ]; then
exit 0
fi
exit 0
fi
- exit 0
-fi
-
# if develop, we force master
[ -z "$COMMIT_ID" ] && [ -n "$DEVELOP" ] && COMMIT_ID="master"
# if develop, we force master
[ -z "$COMMIT_ID" ] && [ -n "$DEVELOP" ] && COMMIT_ID="master"