Update RO charm for the newRO and update bundle

[osm/devops.git] / installers / charm / bundles / osm-ha / bundle.yaml

diff --git a/installers/charm/bundles/osm-ha/bundle.yaml b/installers/charm/bundles/osm-ha/bundle.yaml
index f60082e..ff666c0 100644 (file)
--- a/installers/charm/bundles/osm-ha/bundle.yaml
+++ b/installers/charm/bundles/osm-ha/bundle.yaml
@@ -83,7 +83,6 @@ applications:
       gui-y: 50
   nbi-k8s:
     charm: "%(prefix)s/nbi-k8s%(suffix)s"
-    channel: "%(channel)s"
     scale: 3
     series: kubernetes
     storage:
@@ -97,7 +96,6 @@ applications:
       gui-y: -200
   ro-k8s:
     charm: "%(prefix)s/ro-k8s%(suffix)s"
-    channel: "%(channel)s"
     scale: 3
     series: kubernetes
     storage:
@@ -109,19 +107,8 @@ applications:
     annotations:
       gui-x: -250
       gui-y: 300
-  ui-k8s:
-    charm: "%(prefix)s/ui-k8s%(suffix)s"
-    channel: "%(channel)s"
-    scale: 3
-    series: kubernetes
-    options:
-      mysql_database: lwui
-    annotations:
-      gui-x: 250
-      gui-y: -200
   ng-ui:
     charm: "%(prefix)s/ng-ui%(suffix)s"
-    channel: "%(channel)s"
     scale: 3
     series: kubernetes
     options:
@@ -134,7 +121,6 @@ applications:
       gui-y: 100
   lcm-k8s:
     charm: "%(prefix)s/lcm-k8s%(suffix)s"
-    channel: "%(channel)s"
     scale: 3
     series: kubernetes
     storage:
@@ -153,8 +139,7 @@ applications:
       gui-y: 50
   mon-k8s:
     charm: "%(prefix)s/mon-k8s%(suffix)s"
-    channel: "%(channel)s"
-    scale: 3
+    scale: 1
     series: kubernetes
     storage:
       database: 100M
@@ -175,7 +160,6 @@ applications:
       gui-y: 50
   pol-k8s:
     charm: "%(prefix)s/pol-k8s%(suffix)s"
-    channel: "%(channel)s"
     scale: 3
     series: kubernetes
     storage:
@@ -187,7 +171,6 @@ applications:
       gui-y: 550
   pla:
     charm: "%(prefix)s/pla%(suffix)s"
-    channel: "%(channel)s"
     scale: 3
     series: kubernetes
     annotations:
@@ -196,7 +179,7 @@ applications:
   prometheus-k8s:
     charm: "cs:~charmed-osm/prometheus-k8s"
     channel: "stable"
-    scale: 3
+    scale: 1
     series: kubernetes
     storage:
       database: 100M
@@ -251,10 +234,6 @@ relations:
     - "mon-k8s:prometheus"
   - - "grafana-k8s:prometheus"
     - "prometheus-k8s:prometheus"
-  - - "ui-k8s:mysql"
-    - "mariadb-k8s:mysql"
-  - - "ui-k8s:nbi"
-    - "nbi-k8s:nbi"
   - - "prometheus-k8s:prometheus"
     - "nbi-k8s:prometheus"
   - - "pla:kafka"
@@ -267,3 +246,7 @@ relations:
     - 'mariadb-k8s:mysql'
   - - 'keystone:keystone'
     - 'nbi-k8s:keystone'
+  - - "ro-k8s:mongo"
+    - "mongodb-k8s:mongo"
+  - - "ro-k8s:kafka"
+    - "kafka-k8s:kafka"