From 7b3ed7985e54ed8fffebe264ac23d499ebac1e32 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Mon, 21 Dec 2020 11:50:36 +0000 Subject: [PATCH] Fix installation to use 9 tag as default for docker images Change-Id: Ia0bed5627301fa7bbcaa5a5229ea9138f70d2d92 Signed-off-by: garciadeblas --- installers/docker/docker-compose-lightui.yaml | 2 +- installers/docker/docker-compose.yaml | 12 ++++++------ installers/docker/osm_pla/docker-compose.yaml | 2 +- installers/docker/osm_pla/pla.yaml | 2 +- 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 +- 12 files changed, 17 insertions(+), 17 deletions(-) diff --git a/installers/docker/docker-compose-lightui.yaml b/installers/docker/docker-compose-lightui.yaml index 1b23edd2..3795a4cd 100644 --- a/installers/docker/docker-compose-lightui.yaml +++ b/installers/docker/docker-compose-lightui.yaml @@ -26,7 +26,7 @@ networks: # com.docker.network.driver.mtu: "1446" services: light-ui: - image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-8} + image: ${DOCKER_USER:-opensourcemano}/light-ui:${TAG:-9} networks: - netOSM environment: diff --git a/installers/docker/docker-compose.yaml b/installers/docker/docker-compose.yaml index ea3661e4..0877d81e 100644 --- a/installers/docker/docker-compose.yaml +++ b/installers/docker/docker-compose.yaml @@ -118,7 +118,7 @@ services: networks: - netOSM keystone: - image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-8} + image: ${DOCKER_USER:-opensourcemano}/keystone:${TAG:-9} networks: - netOSM environment: @@ -133,7 +133,7 @@ services: max-size: "100m" max-file: "2" nbi: - image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-8} + image: ${DOCKER_USER:-opensourcemano}/nbi:${TAG:-9} networks: - netOSM volumes: @@ -154,7 +154,7 @@ services: # - kafka # - mongo lcm: - image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-8} + image: ${DOCKER_USER:-opensourcemano}/lcm:${TAG:-9} networks: - netOSM volumes: @@ -193,7 +193,7 @@ services: # ports: # - "3306:3306" ro: - image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-8} + image: ${DOCKER_USER:-opensourcemano}/ro:${TAG:-9} networks: - netOSM environment: @@ -213,7 +213,7 @@ services: max-size: "100m" max-file: "2" mon: - image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-8} + image: ${DOCKER_USER:-opensourcemano}/mon:${TAG:-9} networks: - netOSM volumes: @@ -233,7 +233,7 @@ services: max-file: 5 max-size: 10m pol: - image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-8} + image: ${DOCKER_USER:-opensourcemano}/pol:${TAG:-9} networks: - netOSM volumes: diff --git a/installers/docker/osm_pla/docker-compose.yaml b/installers/docker/osm_pla/docker-compose.yaml index aae303ff..1b101e37 100644 --- a/installers/docker/osm_pla/docker-compose.yaml +++ b/installers/docker/osm_pla/docker-compose.yaml @@ -26,7 +26,7 @@ networks: # com.docker.network.driver.mtu: "1446" services: pla: - image: ${DOCKER_USER:-opensourcemano}/pla:${TAG:-8} + image: ${DOCKER_USER:-opensourcemano}/pla:${TAG:-9} networks: - netOSM logging: diff --git a/installers/docker/osm_pla/pla.yaml b/installers/docker/osm_pla/pla.yaml index dfd00abc..7220489b 100644 --- a/installers/docker/osm_pla/pla.yaml +++ b/installers/docker/osm_pla/pla.yaml @@ -35,7 +35,7 @@ spec: command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongo 27017 ); do sleep 3; done; exit 0"] containers: - name: pla - image: opensourcemano/pla:7 + image: opensourcemano/pla:9 env: - name: OSMPLA_DATABASE_HOST value: mongo diff --git a/installers/docker/osm_pods/keystone.yaml b/installers/docker/osm_pods/keystone.yaml index 051d9023..dfb242a5 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:8 + image: opensourcemano/keystone:9 ports: - containerPort: 5000 protocol: TCP diff --git a/installers/docker/osm_pods/lcm.yaml b/installers/docker/osm_pods/lcm.yaml index ccaa57a9..f66b9d38 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 mongodb-k8s 27017 ); do sleep 3; done; exit 0"] containers: - name: lcm - image: opensourcemano/lcm:8 + image: opensourcemano/lcm:9 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 9f09fa30..720c395d 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:8 + image: opensourcemano/light-ui:9 envFrom: - secretRef: name: lwui-secret diff --git a/installers/docker/osm_pods/mon.yaml b/installers/docker/osm_pods/mon.yaml index 490889f5..c71325fb 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 mongodb-k8s 27017); do sleep 3; done; exit 0"] containers: - name: mon - image: opensourcemano/mon:8 + image: opensourcemano/mon:9 ports: - containerPort: 8662 protocol: TCP diff --git a/installers/docker/osm_pods/nbi.yaml b/installers/docker/osm_pods/nbi.yaml index 87a459db..e6fdae14 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 mongodb-k8s 27017); do sleep 3; done; exit 0"] containers: - name: nbi - image: opensourcemano/nbi:8 + image: opensourcemano/nbi:9 ports: - containerPort: 9999 protocol: TCP diff --git a/installers/docker/osm_pods/ng-ui.yaml b/installers/docker/osm_pods/ng-ui.yaml index 1f430f1a..f2aa9159 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:8 + image: opensourcemano/ng-ui:9 ports: - containerPort: 80 protocol: TCP diff --git a/installers/docker/osm_pods/pol.yaml b/installers/docker/osm_pods/pol.yaml index 063a976a..9e7835f1 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 mongodb-k8s 27017); do sleep 3; done; exit 0"] containers: - name: pol - image: opensourcemano/pol:8 + image: opensourcemano/pol:9 env: - name: OSMPOL_MESSAGE_HOST value: kafka diff --git a/installers/docker/osm_pods/ro.yaml b/installers/docker/osm_pods/ro.yaml index e3ef647f..1c55f99b 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 kafka 9092 && nc -zvw1 mongodb-k8s 27017 ); do sleep 3; done; exit 0"] containers: - name: ro - image: opensourcemano/ro:8 + image: opensourcemano/ro:9 ports: - containerPort: 9090 protocol: TCP -- 2.25.1