From 7cebea8dfc8d698581135f5b9ab234154a3b62a8 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Fri, 3 Jul 2020 15:33:36 +0000 Subject: [PATCH] Installer files adapted for Release EIGHT and docker tag 8 Change-Id: Ie01d2ede53a0bce7a8c468a5fada65169fe7c7e7 Signed-off-by: garciadeblas --- installers/charm/lcm-k8s/config.yaml | 2 +- installers/charm/mon-k8s/config.yaml | 2 +- installers/charm/nbi-k8s/config.yaml | 2 +- installers/charm/pol-k8s/config.yaml | 2 +- installers/charm/ro-k8s/config.yaml | 2 +- installers/charm/ui-k8s/config.yaml | 2 +- installers/docker/docker-compose-ngui.yaml | 14 +++++++------- installers/docker/docker-compose.yaml | 14 +++++++------- installers/docker/osm_pods/keystone.yaml | 2 +- installers/docker/osm_pods/lcm.yaml | 2 +- installers/docker/osm_pods/light-ui.yaml | 2 +- installers/docker/osm_pods/mon.yaml | 2 +- installers/docker/osm_pods/nbi.yaml | 2 +- installers/docker/osm_pods/ng-ui.yaml | 2 +- installers/docker/osm_pods/pol.yaml | 2 +- installers/docker/osm_pods/ro.yaml | 2 +- installers/full_install_osm.sh | 8 ++++---- installers/install_osm.sh | 4 ++-- installers/k8s/README-osm_k8s_monitoring.md | 2 +- 19 files changed, 35 insertions(+), 35 deletions(-) diff --git a/installers/charm/lcm-k8s/config.yaml b/installers/charm/lcm-k8s/config.yaml index 04554874..25f6a71e 100644 --- a/installers/charm/lcm-k8s/config.yaml +++ b/installers/charm/lcm-k8s/config.yaml @@ -65,4 +65,4 @@ options: image: type: string description: OCI image - default: opensourcemano/lcm:7 + default: opensourcemano/lcm:8 diff --git a/installers/charm/mon-k8s/config.yaml b/installers/charm/mon-k8s/config.yaml index f8ea2358..ddf8a812 100644 --- a/installers/charm/mon-k8s/config.yaml +++ b/installers/charm/mon-k8s/config.yaml @@ -67,4 +67,4 @@ options: image: type: string description: OCI image - default: opensourcemano/mon:7 + default: opensourcemano/mon:8 diff --git a/installers/charm/nbi-k8s/config.yaml b/installers/charm/nbi-k8s/config.yaml index 129ff30b..b9472900 100755 --- a/installers/charm/nbi-k8s/config.yaml +++ b/installers/charm/nbi-k8s/config.yaml @@ -31,7 +31,7 @@ options: image: type: string description: OCI image - default: opensourcemano/nbi:7 + default: opensourcemano/nbi:8 auth-backend: type: string description: Authentication backend ('internal' or 'keystone') diff --git a/installers/charm/pol-k8s/config.yaml b/installers/charm/pol-k8s/config.yaml index 59f9d689..8cfd8bf6 100644 --- a/installers/charm/pol-k8s/config.yaml +++ b/installers/charm/pol-k8s/config.yaml @@ -23,4 +23,4 @@ options: image: type: string description: OCI image - default: opensourcemano/pol:7 + default: opensourcemano/pol:8 diff --git a/installers/charm/ro-k8s/config.yaml b/installers/charm/ro-k8s/config.yaml index c35d114d..a18e4958 100755 --- a/installers/charm/ro-k8s/config.yaml +++ b/installers/charm/ro-k8s/config.yaml @@ -31,4 +31,4 @@ options: image: type: string description: OCI image - default: opensourcemano/ro:7 + default: opensourcemano/ro:8 diff --git a/installers/charm/ui-k8s/config.yaml b/installers/charm/ui-k8s/config.yaml index 1f6338e0..8e24da0a 100755 --- a/installers/charm/ui-k8s/config.yaml +++ b/installers/charm/ui-k8s/config.yaml @@ -27,4 +27,4 @@ options: image: type: string description: OCI image - default: opensourcemano/light-ui:7 + default: opensourcemano/light-ui:8 diff --git a/installers/docker/docker-compose-ngui.yaml b/installers/docker/docker-compose-ngui.yaml index 23fa9e89..77e3d847 100644 --- a/installers/docker/docker-compose-ngui.yaml +++ b/installers/docker/docker-compose-ngui.yaml @@ -110,7 +110,7 @@ services: networks: - netOSM keystone: - image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-7} + image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-8} networks: - netOSM environment: @@ -125,7 +125,7 @@ services: max-size: "100m" max-file: "2" nbi: - image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-7} + image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-8} networks: - netOSM volumes: @@ -146,7 +146,7 @@ services: # - kafka # - mongo lcm: - image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-7} + image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-8} networks: - netOSM volumes: @@ -184,7 +184,7 @@ services: # ports: # - "3306:3306" ro: - image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-7} + image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-8} networks: - netOSM environment: @@ -203,7 +203,7 @@ services: max-size: "100m" max-file: "2" mon: - image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-7} + image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-8} networks: - netOSM volumes: @@ -223,7 +223,7 @@ services: max-file: 5 max-size: 10m pol: - image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-7} + image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-8} networks: - netOSM volumes: @@ -242,7 +242,7 @@ services: max-file: 5 max-size: 10m ng-ui: - image: ${DOCKER_USER:-opensourcemano}/ng-ui:${TAG:-7} + image: ${DOCKER_USER:-opensourcemano}/ng-ui:${TAG:-8} networks: - netOSM #depends_on: diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml index f0ec06d1..492036dc 100644 --- a/installers/docker/docker-compose.yaml +++ b/installers/docker/docker-compose.yaml @@ -120,7 +120,7 @@ services: networks: - netOSM keystone: - image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-7} + image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-8} networks: - netOSM environment: @@ -135,7 +135,7 @@ services: max-size: "100m" max-file: "2" nbi: - image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-7} + image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-8} networks: - netOSM volumes: @@ -156,7 +156,7 @@ services: # - kafka # - mongo lcm: - image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-7} + image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-8} networks: - netOSM volumes: @@ -194,7 +194,7 @@ services: # ports: # - "3306:3306" ro: - image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-7} + image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-8} networks: - netOSM environment: @@ -213,7 +213,7 @@ services: max-size: "100m" max-file: "2" mon: - image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-7} + image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-8} networks: - netOSM volumes: @@ -233,7 +233,7 @@ services: max-file: 5 max-size: 10m pol: - image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-7} + image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-8} networks: - netOSM volumes: @@ -252,7 +252,7 @@ services: max-file: 5 max-size: 10m light-ui: - image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-7} + image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-8} networks: - netOSM environment: diff --git a/installers/docker/osm_pods/keystone.yaml b/installers/docker/osm_pods/keystone.yaml index 1d1dc91f..051d9023 100644 --- a/installers/docker/osm_pods/keystone.yaml +++ b/installers/docker/osm_pods/keystone.yaml @@ -46,7 +46,7 @@ spec: spec: containers: - name: keystone - image: opensourcemano/keystone:7 + image: opensourcemano/keystone:8 ports: - containerPort: 5000 protocol: TCP diff --git a/installers/docker/osm_pods/lcm.yaml b/installers/docker/osm_pods/lcm.yaml index c74143f3..0801b826 100644 --- a/installers/docker/osm_pods/lcm.yaml +++ b/installers/docker/osm_pods/lcm.yaml @@ -36,7 +36,7 @@ spec: command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 ro 9090 && nc -zvw1 mongo 27017 ); do sleep 3; done; exit 0"] containers: - name: lcm - image: opensourcemano/lcm:7 + image: opensourcemano/lcm:8 env: - name: OSMLCM_RO_HOST value: ro diff --git a/installers/docker/osm_pods/light-ui.yaml b/installers/docker/osm_pods/light-ui.yaml index e4c62842..9f09fa30 100644 --- a/installers/docker/osm_pods/light-ui.yaml +++ b/installers/docker/osm_pods/light-ui.yaml @@ -46,7 +46,7 @@ spec: spec: containers: - name: light-ui - image: opensourcemano/light-ui:7 + image: opensourcemano/light-ui:8 envFrom: - secretRef: name: lwui-secret diff --git a/installers/docker/osm_pods/mon.yaml b/installers/docker/osm_pods/mon.yaml index 4dd10d40..988054f3 100644 --- a/installers/docker/osm_pods/mon.yaml +++ b/installers/docker/osm_pods/mon.yaml @@ -50,7 +50,7 @@ spec: command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongo 27017); do sleep 3; done; exit 0"] containers: - name: mon - image: opensourcemano/mon:7 + image: opensourcemano/mon:8 ports: - containerPort: 8662 protocol: TCP diff --git a/installers/docker/osm_pods/nbi.yaml b/installers/docker/osm_pods/nbi.yaml index 0b8a84b8..ea6014ec 100644 --- a/installers/docker/osm_pods/nbi.yaml +++ b/installers/docker/osm_pods/nbi.yaml @@ -50,7 +50,7 @@ spec: command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongo 27017); do sleep 3; done; exit 0"] containers: - name: nbi - image: opensourcemano/nbi:7 + image: opensourcemano/nbi:8 ports: - containerPort: 9999 protocol: TCP diff --git a/installers/docker/osm_pods/ng-ui.yaml b/installers/docker/osm_pods/ng-ui.yaml index 4461c3b5..1f430f1a 100644 --- a/installers/docker/osm_pods/ng-ui.yaml +++ b/installers/docker/osm_pods/ng-ui.yaml @@ -46,7 +46,7 @@ spec: spec: containers: - name: ng-ui - image: opensourcemano/ng-ui:7 + image: opensourcemano/ng-ui:8 ports: - containerPort: 80 protocol: TCP diff --git a/installers/docker/osm_pods/pol.yaml b/installers/docker/osm_pods/pol.yaml index f6ba4373..438ae1ff 100644 --- a/installers/docker/osm_pods/pol.yaml +++ b/installers/docker/osm_pods/pol.yaml @@ -36,7 +36,7 @@ spec: command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongo 27017); do sleep 3; done; exit 0"] containers: - name: pol - image: opensourcemano/pol:7 + image: opensourcemano/pol:8 env: - name: OSMPOL_MESSAGE_HOST value: kafka diff --git a/installers/docker/osm_pods/ro.yaml b/installers/docker/osm_pods/ro.yaml index f98f69b1..6113a99d 100644 --- a/installers/docker/osm_pods/ro.yaml +++ b/installers/docker/osm_pods/ro.yaml @@ -50,7 +50,7 @@ spec: command: ["sh", "-c", "until nc -zvw1 mysql 3306; do sleep 3 ; done; exit 0"] containers: - name: ro - image: opensourcemano/ro:7 + image: opensourcemano/ro:8 ports: - containerPort: 9090 protocol: TCP diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh index 5bbf49b0..af618731 100755 --- a/installers/full_install_osm.sh +++ b/installers/full_install_osm.sh @@ -1189,7 +1189,7 @@ EOF [ -z "$INSTALL_NOHOSTCLIENT" ] && install_osmclient track osmclient - wget -q -O- https://osm-download.etsi.org/ftp/osm-7.0-seven/README2.txt &> /dev/null + wget -q -O- https://osm-download.etsi.org/ftp/osm-8.0-eight/README2.txt &> /dev/null track end return 0 } @@ -1337,7 +1337,7 @@ SHOWOPTS="" COMMIT_ID="" ASSUME_YES="" INSTALL_FROM_SOURCE="" -RELEASE="ReleaseSEVEN" +RELEASE="ReleaseEIGHT" REPOSITORY="stable" INSTALL_VIMEMU="" INSTALL_PLA="" @@ -1639,7 +1639,7 @@ fi [ -n "$INSTALL_ONLY" ] && echo -e "\nDONE" && exit 0 #Installation starts here -wget -q -O- https://osm-download.etsi.org/ftp/osm-7.0-seven/README.txt &> /dev/null +wget -q -O- https://osm-download.etsi.org/ftp/osm-8.0-eight/README.txt &> /dev/null track start [ -n "$INSTALL_LIGHTWEIGHT" ] && install_lightweight && echo -e "\nDONE" && exit 0 @@ -1660,7 +1660,7 @@ export OSM_USE_LOCAL_DEVOPS=true #Install vim-emu (optional) [ -n "$INSTALL_VIMEMU" ] && install_docker_ce && install_vimemu -wget -q -O- https://osm-download.etsi.org/ftp/osm-7.0-seven/README2.txt &> /dev/null +wget -q -O- https://osm-download.etsi.org/ftp/osm-8.0-eight/README2.txt &> /dev/null track end echo -e "\nDONE" diff --git a/installers/install_osm.sh b/installers/install_osm.sh index 5b737594..3918f3fe 100755 --- a/installers/install_osm.sh +++ b/installers/install_osm.sh @@ -13,9 +13,9 @@ # limitations under the License. # REPOSITORY_BASE=https://osm-download.etsi.org/repository/osm/debian -RELEASE=ReleaseSEVEN +RELEASE=ReleaseEIGHT REPOSITORY=stable -DOCKER_TAG=7 +DOCKER_TAG=8 function usage(){ echo -e "usage: $0 [OPTIONS]" diff --git a/installers/k8s/README-osm_k8s_monitoring.md b/installers/k8s/README-osm_k8s_monitoring.md index 5632f4b4..1ce8bd0d 100644 --- a/installers/k8s/README-osm_k8s_monitoring.md +++ b/installers/k8s/README-osm_k8s_monitoring.md @@ -44,7 +44,7 @@ It is important to note that Grafana is not installed with this chart because we ## Install procedure -There are two ways to install the monitoring component based on the OSM global installer () +There are two ways to install the monitoring component based on the OSM global installer () * Using the --k8s_monitor switch in the OSM installation: -- 2.17.1