projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release 13 Preparation
[osm/devops.git]
/
installers
/
charmed_install.sh
diff --git
a/installers/charmed_install.sh
b/installers/charmed_install.sh
index
2cd9a07
..
fe7dfb0
100755
(executable)
--- a/
installers/charmed_install.sh
+++ b/
installers/charmed_install.sh
@@
-15,13
+15,13
@@
# set -eux
# set -eux
-LXD_VERSION=
4
.0
+LXD_VERSION=
5
.0
JUJU_VERSION=2.9
JUJU_VERSION=2.9
-JUJU_AGENT_VERSION=2.9.3
3
+JUJU_AGENT_VERSION=2.9.3
4
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=
13.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}
@@
-44,7
+44,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/beta
+CHARMHUB_CHANNEL=
13.0/stable
unset TAG
function check_arguments(){
unset TAG
function check_arguments(){
@@
-177,7
+177,12
@@
EOF
sudo sysctl --system
# Install LXD snap
sudo apt-get remove --purge -y liblxc1 lxc-common lxcfs lxd lxd-client
sudo sysctl --system
# Install LXD snap
sudo apt-get remove --purge -y liblxc1 lxc-common lxcfs lxd lxd-client
- sudo snap install lxd --channel $LXD_VERSION/stable
+ snap info lxd | grep installed > /dev/null
+ if [ $? -eq 0 ]; then
+ sudo snap refresh lxd --channel $LXD_VERSION/stable
+ else
+ sudo snap install lxd --channel $LXD_VERSION/stable
+ fi
# Configure LXD
sudo usermod -a -G lxd `whoami`
cat /usr/share/osm-devops/installers/lxd-preseed.conf | sed 's/^config: {}/config:\n core.https_address: '$LXDENDPOINT':8443/' | sg lxd -c "lxd init --preseed"
# Configure LXD
sudo usermod -a -G lxd `whoami`
cat /usr/share/osm-devops/installers/lxd-preseed.conf | sed 's/^config: {}/config:\n core.https_address: '$LXDENDPOINT':8443/' | sg lxd -c "lxd init --preseed"
@@
-392,7
+397,7
@@
EOF
cat << EOF >> /tmp/images-overlay.yaml
${charm}:
resources:
cat << EOF >> /tmp/images-overlay.yaml
${charm}:
resources:
- image: /tmp/${charm}_registry.yaml
+
${charm}-
image: /tmp/${charm}_registry.yaml
EOF
done
EOF
done