projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
K8s manifest files updated to use docker tag 7 instead of latest
[osm/devops.git]
/
installers
/
full_install_osm.sh
diff --git
a/installers/full_install_osm.sh
b/installers/full_install_osm.sh
index
864c02f
..
b88fc47
100755
(executable)
--- a/
installers/full_install_osm.sh
+++ b/
installers/full_install_osm.sh
@@
-120,7
+120,7
@@
function remove_volumes() {
$WORKDIR_SUDO rm -rf ${k8_volume}
else
stack=$1
$WORKDIR_SUDO rm -rf ${k8_volume}
else
stack=$1
- volumes="mongo_db mon_db osm_packages ro_db"
+ volumes="mongo_db mon_db osm_packages ro_db
pol_db prom_db ro
"
for volume in $volumes; do
sg docker -c "docker volume rm ${stack}_${volume}"
done
for volume in $volumes; do
sg docker -c "docker volume rm ${stack}_${volume}"
done
@@
-890,9
+890,9
@@
function generate_docker_env_files() {
fi
if ! grep -Fq "OSMLCM_VCA_PUBKEY" $OSM_DOCKER_WORK_DIR/lcm.env; then
fi
if ! grep -Fq "OSMLCM_VCA_PUBKEY" $OSM_DOCKER_WORK_DIR/lcm.env; then
- echo "OSMLCM_VCA_PUBKEY=
\"${OSM_VCA_PUBKEY}\"
" | $WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/lcm.env
+ echo "OSMLCM_VCA_PUBKEY=
${OSM_VCA_PUBKEY}
" | $WORKDIR_SUDO tee -a $OSM_DOCKER_WORK_DIR/lcm.env
else
else
- $WORKDIR_SUDO sed -i "s|OSMLCM_VCA_PUBKEY.*|OSMLCM_VCA_PUBKEY=
\"${OSM_VCA_PUBKEY}\"
|g" $OSM_DOCKER_WORK_DIR/lcm.env
+ $WORKDIR_SUDO sed -i "s|OSMLCM_VCA_PUBKEY.*|OSMLCM_VCA_PUBKEY=
${OSM_VCA_PUBKEY}
|g" $OSM_DOCKER_WORK_DIR/lcm.env
fi
if ! grep -Fq "OSMLCM_VCA_CACERT" $OSM_DOCKER_WORK_DIR/lcm.env; then
fi
if ! grep -Fq "OSMLCM_VCA_CACERT" $OSM_DOCKER_WORK_DIR/lcm.env; then
@@
-1313,7
+1313,7
@@
function install_lightweight() {
[ -z "$INSTALL_NOHOSTCLIENT" ] && install_osmclient
track osmclient
[ -z "$INSTALL_NOHOSTCLIENT" ] && install_osmclient
track osmclient
- wget -q -O- https://osm-download.etsi.org/ftp/osm-
6.0-six
/README2.txt &> /dev/null
+ wget -q -O- https://osm-download.etsi.org/ftp/osm-
7.0-seven
/README2.txt &> /dev/null
track end
return 0
}
track end
return 0
}
@@
-1674,7
+1674,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-
6.0-six
/README.txt &> /dev/null
+wget -q -O- https://osm-download.etsi.org/ftp/osm-
7.0-seven
/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
@@
-1730,6
+1730,6
@@
fi
#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-
6.0-six
/README2.txt &> /dev/null
+wget -q -O- https://osm-download.etsi.org/ftp/osm-
7.0-seven
/README2.txt &> /dev/null
track end
echo -e "\nDONE"
track end
echo -e "\nDONE"