Use mongodb charm in k8s installer
- Update JUJU_AGENT_VERSION to 2.8.6
- Use mongodb charm and update needed osm pod specs to point at it
Change-Id: I7c03ae7de6611fcacef35716646ff08bfc1ff988
Signed-off-by: David Garcia <david.garcia@canonical.com>
diff --git a/installers/docker/osm_pla/pla.yaml b/installers/docker/osm_pla/pla.yaml
index c5bdd50..dfd00ab 100644
--- a/installers/docker/osm_pla/pla.yaml
+++ b/installers/docker/osm_pla/pla.yaml
@@ -41,6 +41,8 @@
value: mongo
- name: OSMPLA_MESSAGE_HOST
value: kafka
+ - name: OSMPLA_DATABASE_URI
+ value: mongodb://mongodb-k8s:27017/?replicaSet=rs0
volumeMounts:
- name: osm-packages
mountPath: /app/storage
diff --git a/installers/docker/osm_pods/lcm.yaml b/installers/docker/osm_pods/lcm.yaml
index 6858f2a..e2c27bd 100644
--- a/installers/docker/osm_pods/lcm.yaml
+++ b/installers/docker/osm_pods/lcm.yaml
@@ -33,15 +33,15 @@
initContainers:
- name: kafka-ro-mongo-test
image: alpine:latest
- command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 ro 9090 && nc -zvw1 mongo 27017 ); do sleep 3; done; exit 0"]
+ 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
env:
- name: OSMLCM_RO_HOST
value: ro
- - name: OSMLCM_DATABASE_HOST
- value: mongo
+ - name: OSMLCM_DATABASE_URI
+ value: mongodb://mongodb-k8s:27017/?replicaSet=rs0
- name: OSMLCM_MESSAGE_HOST
value: kafka
envFrom:
diff --git a/installers/docker/osm_pods/mon.yaml b/installers/docker/osm_pods/mon.yaml
index 988054f..490889f 100644
--- a/installers/docker/osm_pods/mon.yaml
+++ b/installers/docker/osm_pods/mon.yaml
@@ -47,7 +47,7 @@
initContainers:
- name: kafka-mongo-test
image: alpine:latest
- command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongo 27017); do sleep 3; done; exit 0"]
+ 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
@@ -59,6 +59,8 @@
value: kafka
- name: OSMMON_MESSAGE_PORT
value: "9092"
+ - name: OSMMON_DATABASE_URI
+ value: mongodb://mongodb-k8s:27017/?replicaSet=rs0
envFrom:
- secretRef:
name: mon-secret
diff --git a/installers/docker/osm_pods/nbi.yaml b/installers/docker/osm_pods/nbi.yaml
index ea6014e..7fc6595 100644
--- a/installers/docker/osm_pods/nbi.yaml
+++ b/installers/docker/osm_pods/nbi.yaml
@@ -47,7 +47,7 @@
initContainers:
- name: kafka-mongo-test
image: alpine:latest
- command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongo 27017); do sleep 3; done; exit 0"]
+ 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
@@ -55,8 +55,8 @@
- containerPort: 9999
protocol: TCP
env:
- - name: OSMNBI_DATABASE_HOST
- value: mongo
+ - name: OSMNBI_DATABASE_URI
+ value: mongodb://mongodb-k8s:27017/?replicaSet=rs0
- name: OSMNBI_MESSAGE_HOST
value: kafka
envFrom:
diff --git a/installers/docker/osm_pods/pol.yaml b/installers/docker/osm_pods/pol.yaml
index 438ae1f..063a976 100644
--- a/installers/docker/osm_pods/pol.yaml
+++ b/installers/docker/osm_pods/pol.yaml
@@ -33,7 +33,7 @@
initContainers:
- name: kafka-mongo-test
image: alpine:latest
- command: ["sh", "-c", "until (nc -zvw1 kafka 9092 && nc -zvw1 mongo 27017); do sleep 3; done; exit 0"]
+ 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
@@ -42,6 +42,8 @@
value: kafka
- name: OSMPOL_MESSAGE_PORT
value: "9092"
+ - name: OSMPOL_DATABASE_URI
+ value: mongodb://mongodb-k8s:27017/?replicaSet=rs0
envFrom:
- secretRef:
name: pol-secret