projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update install_osm.sh to solve the issue with no valid OpenPGP data found
[osm/devops.git]
/
installers
/
full_install_osm.sh
diff --git
a/installers/full_install_osm.sh
b/installers/full_install_osm.sh
index
830091c
..
3084207
100755
(executable)
--- a/
installers/full_install_osm.sh
+++ b/
installers/full_install_osm.sh
@@
-255,10
+255,6
@@
function generate_docker_images() {
sg docker -c "docker pull wurstmeister/kafka:${KAFKA_TAG}" || FATAL "cannot get kafka docker image"
fi
sg docker -c "docker pull wurstmeister/kafka:${KAFKA_TAG}" || FATAL "cannot get kafka docker image"
fi
- if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q MONGO ; then
- sg docker -c "docker pull mongo" || FATAL "cannot get mongo docker image"
- fi
-
if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q PROMETHEUS ; then
sg docker -c "docker pull prom/prometheus:${PROMETHEUS_TAG}" || FATAL "cannot get prometheus docker image"
fi
if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q PROMETHEUS ; then
sg docker -c "docker pull prom/prometheus:${PROMETHEUS_TAG}" || FATAL "cannot get prometheus docker image"
fi
@@
-269,6
+265,7
@@
function generate_docker_images() {
if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q GRAFANA ; then
sg docker -c "docker pull grafana/grafana:${GRAFANA_TAG}" || FATAL "cannot get grafana docker image"
if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q GRAFANA ; then
sg docker -c "docker pull grafana/grafana:${GRAFANA_TAG}" || FATAL "cannot get grafana docker image"
+ sg docker -c "docker pull kiwigrid/k8s-sidecar:${KIWIGRID_K8S_SIDECAR_TAG}" || FATAL "cannot get kiwigrid k8s-sidecar docker image"
fi
if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q NBI || echo $TO_REBUILD | grep -q KEYSTONE-DB ; then
fi
if [ -z "$TO_REBUILD" ] || echo $TO_REBUILD | grep -q NBI || echo $TO_REBUILD | grep -q KEYSTONE-DB ; then
@@
-342,7
+339,6
@@
function generate_k8s_manifest_files() {
[ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
#Kubernetes resources
sudo cp -bR ${OSM_DEVOPS}/installers/docker/osm_pods $OSM_DOCKER_WORK_DIR
[ -z "${DEBUG_INSTALL}" ] || DEBUG beginning of function
#Kubernetes resources
sudo cp -bR ${OSM_DEVOPS}/installers/docker/osm_pods $OSM_DOCKER_WORK_DIR
- sudo rm -f $OSM_K8S_WORK_DIR/mongo.yaml
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
}
[ -z "${DEBUG_INSTALL}" ] || DEBUG end of function
}
@@
-839,6
+835,8
@@
function dump_vars(){
echo "OPENSTACK_VM_NAME"="$OPENSTACK_VM_NAME"
echo "OSM_DEVOPS=$OSM_DEVOPS"
echo "OSM_DOCKER_TAG=$OSM_DOCKER_TAG"
echo "OPENSTACK_VM_NAME"="$OPENSTACK_VM_NAME"
echo "OSM_DEVOPS=$OSM_DEVOPS"
echo "OSM_DOCKER_TAG=$OSM_DOCKER_TAG"
+ echo "OSM_DOCKER_WORK_DIR=$OSM_DOCKER_WORK_DIR"
+ echo "OSM_K8S_WORK_DIR=$OSM_K8S_WORK_DIR"
echo "OSM_STACK_NAME=$OSM_STACK_NAME"
echo "OSM_VCA_HOST=$OSM_VCA_HOST"
echo "OSM_VCA_PUBKEY=$OSM_VCA_PUBKEY"
echo "OSM_STACK_NAME=$OSM_STACK_NAME"
echo "OSM_VCA_HOST=$OSM_VCA_HOST"
echo "OSM_VCA_PUBKEY=$OSM_VCA_PUBKEY"
@@
-876,7
+874,7
@@
function ctrl_c() {
LXD_VERSION=4.0
JUJU_VERSION=2.9
LXD_VERSION=4.0
JUJU_VERSION=2.9
-JUJU_AGENT_VERSION=2.9.
17
+JUJU_AGENT_VERSION=2.9.
22
UNINSTALL=""
DEVELOP=""
UPDATE=""
UNINSTALL=""
DEVELOP=""
UPDATE=""
@@
-932,8
+930,9
@@
OSM_DOCKER_TAG=latest
DOCKER_USER=opensourcemano
PULL_IMAGES="y"
KAFKA_TAG=2.11-1.0.2
DOCKER_USER=opensourcemano
PULL_IMAGES="y"
KAFKA_TAG=2.11-1.0.2
-PROMETHEUS_TAG=v2.4.3
-GRAFANA_TAG=latest
+KIWIGRID_K8S_SIDECAR_TAG="1.15.6"
+PROMETHEUS_TAG=v2.28.1
+GRAFANA_TAG=8.1.1
PROMETHEUS_NODE_EXPORTER_TAG=0.18.1
PROMETHEUS_CADVISOR_TAG=latest
KEYSTONEDB_TAG=10
PROMETHEUS_NODE_EXPORTER_TAG=0.18.1
PROMETHEUS_CADVISOR_TAG=latest
KEYSTONEDB_TAG=10