From: David Garcia <david.garcia@canonical.com>
Date: Mon, 30 Nov 2020 15:29:54 +0000 (+0100)
Subject: Fix ro-k8s charm to include commonkey
X-Git-Tag: release-v9.0-start~26
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=ae58dabd3561cb3628106b7baba06e58cf35262c;p=osm%2Fdevops.git

Fix ro-k8s charm to include commonkey

Change-Id: I869b09709585c0cd1cbdd067d6837c94348872b6
Signed-off-by: David Garcia <david.garcia@canonical.com>
---

diff --git a/installers/charm/ro-k8s/config.yaml b/installers/charm/ro-k8s/config.yaml
index 31eaca8a..e93cc495 100755
--- a/installers/charm/ro-k8s/config.yaml
+++ b/installers/charm/ro-k8s/config.yaml
@@ -40,3 +40,7 @@ options:
     description: Docker repository password
     type: string
     default: ""
+  database_commonkey:
+    description: Database common key
+    type: string
+    default: osm
\ No newline at end of file
diff --git a/installers/charm/ro-k8s/reactive/ro.py b/installers/charm/ro-k8s/reactive/ro.py
index 094812fb..aef1bea7 100644
--- a/installers/charm/ro-k8s/reactive/ro.py
+++ b/installers/charm/ro-k8s/reactive/ro.py
@@ -207,6 +207,7 @@ def make_pod_spec_new_ro(kafka_host, mongodb_uri):
         {
             "OSMRO_DATABASE_URI": mongodb_uri,
             "OSMRO_MESSAGE_HOST": kafka_host,
+            "OSMRO_DATABASE_COMMONKEY": cfg.get("database_commonkey"),
         }
     )
     return spec