projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add Kafka and Zookeeper charms in operator framework
[osm/devops.git]
/
installers
/
full_install_osm.sh
diff --git
a/installers/full_install_osm.sh
b/installers/full_install_osm.sh
index
1d9cfc3
..
a612358
100755
(executable)
--- a/
installers/full_install_osm.sh
+++ b/
installers/full_install_osm.sh
@@
-446,7
+446,7
@@
function install_docker_compose() {
function install_juju() {
echo "Installing juju"
function install_juju() {
echo "Installing juju"
- sudo snap install juju --classic --channel=
2.8
/stable
+ sudo snap install juju --classic --channel=
$JUJU_VERSION
/stable
[[ ":$PATH": != *":/snap/bin:"* ]] && PATH="/snap/bin:${PATH}"
[ -n "$INSTALL_NOCACHELXDIMAGES" ] || update_juju_images
echo "Finished installation of juju"
[[ ":$PATH": != *":/snap/bin:"* ]] && PATH="/snap/bin:${PATH}"
[ -n "$INSTALL_NOCACHELXDIMAGES" ] || update_juju_images
echo "Finished installation of juju"
@@
-632,7
+632,6
@@
function generate_k8s_manifest_files() {
#Kubernetes resources
$WORKDIR_SUDO cp -bR ${OSM_DEVOPS}/installers/docker/osm_pods $OSM_DOCKER_WORK_DIR
$WORKDIR_SUDO rm -f $OSM_K8S_WORK_DIR/mongo.yaml
#Kubernetes resources
$WORKDIR_SUDO cp -bR ${OSM_DEVOPS}/installers/docker/osm_pods $OSM_DOCKER_WORK_DIR
$WORKDIR_SUDO rm -f $OSM_K8S_WORK_DIR/mongo.yaml
- $WORKDIR_SUDO rm -f $OSM_K8S_WORK_DIR/ng-ui.yaml
}
function generate_prometheus_grafana_files() {
}
function generate_prometheus_grafana_files() {
@@
-902,13
+901,7
@@
function deploy_osm_services() {
#deploy charmed services
function deploy_charmed_services() {
juju add-model $OSM_STACK_NAME $OSM_VCA_K8S_CLOUDNAME
#deploy charmed services
function deploy_charmed_services() {
juju add-model $OSM_STACK_NAME $OSM_VCA_K8S_CLOUDNAME
- # deploy mongodb charm
- namespace=$OSM_STACK_NAME
- juju deploy cs:~charmed-osm/mongodb-k8s \
- --config enable-sidecar=true \
- --config replica-set=rs0 \
- --config namespace=$namespace \
- -m $namespace
+ juju deploy ch:mongodb-k8s -m $OSM_STACK_NAME
}
function deploy_osm_pla_service() {
}
function deploy_osm_pla_service() {
@@
-981,7
+974,7
@@
function update_manifest_files() {
list_of_services="$list_of_services $module"
fi
done
list_of_services="$list_of_services $module"
fi
done
- if [ ! "$OSM_DOCKER_TAG" == "
9
" ]; then
+ if [ ! "$OSM_DOCKER_TAG" == "
10
" ]; then
parse_yaml $OSM_DOCKER_TAG $list_of_services
fi
if [ -n "$MODULE_DOCKER_TAG" ]; then
parse_yaml $OSM_DOCKER_TAG $list_of_services
fi
if [ -n "$MODULE_DOCKER_TAG" ]; then
@@
-1378,7
+1371,7
@@
EOF
[ -n "$KUBERNETES" ] && add_local_k8scluster
track add_local_k8scluster
[ -n "$KUBERNETES" ] && add_local_k8scluster
track add_local_k8scluster
- wget -q -O- https://osm-download.etsi.org/ftp/osm-
9.0-nine
/README2.txt &> /dev/null
+ wget -q -O- https://osm-download.etsi.org/ftp/osm-
10.0-ten
/README2.txt &> /dev/null
track end
return 0
}
track end
return 0
}
@@
-1549,7
+1542,8
@@
function parse_docker_registry_url() {
DOCKER_REGISTRY_URL=$(echo "$DOCKER_REGISTRY_URL" | awk '{split($1,a,"@"); print a[2]}')
}
DOCKER_REGISTRY_URL=$(echo "$DOCKER_REGISTRY_URL" | awk '{split($1,a,"@"); print a[2]}')
}
-JUJU_AGENT_VERSION=2.8.6
+JUJU_VERSION=2.9
+JUJU_AGENT_VERSION=2.9.9
UNINSTALL=""
DEVELOP=""
UPDATE=""
UNINSTALL=""
DEVELOP=""
UPDATE=""
@@
-1560,7
+1554,7
@@
SHOWOPTS=""
COMMIT_ID=""
ASSUME_YES=""
INSTALL_FROM_SOURCE=""
COMMIT_ID=""
ASSUME_YES=""
INSTALL_FROM_SOURCE=""
-RELEASE="Release
NINE
"
+RELEASE="Release
TEN
"
REPOSITORY="stable"
INSTALL_VIMEMU=""
INSTALL_PLA=""
REPOSITORY="stable"
INSTALL_VIMEMU=""
INSTALL_PLA=""
@@
-1871,7
+1865,7
@@
fi
[ -n "$INSTALL_ONLY" ] && echo -e "\nDONE" && exit 0
#Installation starts here
[ -n "$INSTALL_ONLY" ] && echo -e "\nDONE" && exit 0
#Installation starts here
-wget -q -O- https://osm-download.etsi.org/ftp/osm-
9.0-nine
/README.txt &> /dev/null
+wget -q -O- https://osm-download.etsi.org/ftp/osm-
10.0-ten
/README.txt &> /dev/null
track start
[ -n "$INSTALL_LIGHTWEIGHT" ] && install_lightweight && echo -e "\nDONE" && exit 0
track start
[ -n "$INSTALL_LIGHTWEIGHT" ] && install_lightweight && echo -e "\nDONE" && exit 0
@@
-1892,6
+1886,6
@@
export OSM_USE_LOCAL_DEVOPS=true
#Install vim-emu (optional)
[ -n "$INSTALL_VIMEMU" ] && install_docker_ce && install_vimemu
#Install vim-emu (optional)
[ -n "$INSTALL_VIMEMU" ] && install_docker_ce && install_vimemu
-wget -q -O- https://osm-download.etsi.org/ftp/osm-
9.0-nine
/README2.txt &> /dev/null
+wget -q -O- https://osm-download.etsi.org/ftp/osm-
10.0-ten
/README2.txt &> /dev/null
track end
echo -e "\nDONE"
track end
echo -e "\nDONE"