Installer files adapted for Release EIGHT and docker tag 8 17/9317/1
authorgarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 3 Jul 2020 15:33:36 +0000 (15:33 +0000)
committergarciadeblas <gerardo.garciadeblas@telefonica.com>
Fri, 3 Jul 2020 16:25:09 +0000 (16:25 +0000)
Change-Id: Ie01d2ede53a0bce7a8c468a5fada65169fe7c7e7
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
19 files changed:
installers/charm/lcm-k8s/config.yaml
installers/charm/mon-k8s/config.yaml
installers/charm/nbi-k8s/config.yaml
installers/charm/pol-k8s/config.yaml
installers/charm/ro-k8s/config.yaml
installers/charm/ui-k8s/config.yaml
installers/docker/docker-compose-ngui.yaml
installers/docker/docker-compose.yaml
installers/docker/osm_pods/keystone.yaml
installers/docker/osm_pods/lcm.yaml
installers/docker/osm_pods/light-ui.yaml
installers/docker/osm_pods/mon.yaml
installers/docker/osm_pods/nbi.yaml
installers/docker/osm_pods/ng-ui.yaml
installers/docker/osm_pods/pol.yaml
installers/docker/osm_pods/ro.yaml
installers/full_install_osm.sh
installers/install_osm.sh
installers/k8s/README-osm_k8s_monitoring.md

index 0455487..25f6a71 100644 (file)
@@ -65,4 +65,4 @@ options:
   image:
     type: string
     description: OCI image
-    default: opensourcemano/lcm:7
+    default: opensourcemano/lcm:8
index f8ea235..ddf8a81 100644 (file)
@@ -67,4 +67,4 @@ options:
   image:
     type: string
     description: OCI image
-    default: opensourcemano/mon:7
+    default: opensourcemano/mon:8
index 129ff30..b947290 100755 (executable)
@@ -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')
index 59f9d68..8cfd8bf 100644 (file)
@@ -23,4 +23,4 @@ options:
   image:
     type: string
     description: OCI image
-    default: opensourcemano/pol:7
+    default: opensourcemano/pol:8
index c35d114..a18e495 100755 (executable)
@@ -31,4 +31,4 @@ options:
   image:
     type: string
     description: OCI image
-    default: opensourcemano/ro:7
+    default: opensourcemano/ro:8
index 1f6338e..8e24da0 100755 (executable)
@@ -27,4 +27,4 @@ options:
   image:
     type: string
     description: OCI image
-    default: opensourcemano/light-ui:7
+    default: opensourcemano/light-ui:8
index 23fa9e8..77e3d84 100644 (file)
@@ -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:
index f0ec06d..492036d 100644 (file)
@@ -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:
index 1d1dc91..051d902 100644 (file)
@@ -46,7 +46,7 @@ spec:
     spec:
       containers:
       - name: keystone
-        image: opensourcemano/keystone:7
+        image: opensourcemano/keystone:8
         ports:
         - containerPort: 5000
           protocol: TCP
index c74143f..0801b82 100644 (file)
@@ -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
index e4c6284..9f09fa3 100644 (file)
@@ -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
index 4dd10d4..988054f 100644 (file)
@@ -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
index 0b8a84b..ea6014e 100644 (file)
@@ -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
index 4461c3b..1f430f1 100644 (file)
@@ -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
index f6ba437..438ae1f 100644 (file)
@@ -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
index f98f69b..6113a99 100644 (file)
@@ -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
index 5bbf49b..af61873 100755 (executable)
@@ -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"
 
index 5b73759..3918f3f 100755 (executable)
@@ -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]"
index 5632f4b..1ce8bd0 100644 (file)
@@ -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 (<https://osm-download.etsi.org/ftp/osm-7.0-seven/install_osm.sh>)
+There are two ways to install the monitoring component based on the OSM global installer (<https://osm-download.etsi.org/ftp/osm-8.0-eight/install_osm.sh>)
 
 * Using the --k8s_monitor switch in the OSM installation: