X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fbundles%2Fosm%2Fbundle.yaml;h=9031388a281b4ad7ac4924960b141ffa84d8bd8f;hb=cafe31e388357499765ddc3360b865800b612d7a;hp=cd3a2a67ed71186bb26b888968deba85fd7f67e0;hpb=2326429761007dde9cf9b2ff2ba327b651ed8759;p=osm%2Fdevops.git

diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml
index cd3a2a67..9031388a 100644
--- a/installers/charm/bundles/osm/bundle.yaml
+++ b/installers/charm/bundles/osm/bundle.yaml
@@ -27,9 +27,8 @@ description: |
   - Availability of managed services
 bundle: kubernetes
 applications:
-  zookeeper-k8s:
-    charm: "cs:~charmed-osm/zookeeper-k8s"
-    channel: "stable"
+  zookeeper:
+    charm: "cs:~charmed-osm/zookeeper-1"
     scale: 1
     series: kubernetes
     storage:
@@ -51,9 +50,8 @@ applications:
     annotations:
       gui-x: -300
       gui-y: -250
-  kafka-k8s:
-    charm: "cs:~charmed-osm/kafka-k8s"
-    channel: "stable"
+  kafka:
+    charm: "cs:~charmed-osm/kafka-1"
     scale: 1
     series: kubernetes
     storage:
@@ -61,22 +59,17 @@ applications:
     annotations:
       gui-x: 0
       gui-y: 250
-  mongodb-k8s:
-    charm: "cs:~charmed-osm/mongodb-k8s"
-    channel: "stable"
+  mongodb:
+    charm: ch:mongodb-k8s
     scale: 1
     series: kubernetes
     storage:
-      database: 50M
-    options:
-      replica-set: rs0
-      namespace: osm
-      enable-sidecar: true
+      db: 50M
     annotations:
       gui-x: 0
       gui-y: 0
   nbi:
-    charm: "cs:~charmed-osm/nbi-8"
+    charm: "cs:~charmed-osm/nbi-18"
     scale: 1
     series: kubernetes
     options:
@@ -87,7 +80,7 @@ applications:
       gui-x: 0
       gui-y: -250
   ro:
-    charm: "cs:~charmed-osm/ro-3"
+    charm: "cs:~charmed-osm/ro-10"
     scale: 1
     series: kubernetes
     options:
@@ -96,14 +89,14 @@ applications:
       gui-x: -300
       gui-y: 250
   ng-ui:
-    charm: "cs:~charmed-osm/ng-ui-19"
+    charm: "cs:~charmed-osm/ng-ui-25"
     scale: 1
     series: kubernetes
     annotations:
       gui-x: 600
       gui-y: 0
   lcm:
-    charm: "cs:~charmed-osm/lcm-4"
+    charm: "cs:~charmed-osm/lcm-15"
     scale: 1
     series: kubernetes
     options:
@@ -113,7 +106,7 @@ applications:
       gui-x: -300
       gui-y: 0
   mon:
-    charm: "cs:~charmed-osm/mon-4"
+    charm: "cs:~charmed-osm/mon-12"
     scale: 1
     series: kubernetes
     options:
@@ -124,7 +117,7 @@ applications:
       gui-x: 300
       gui-y: 0
   pol:
-    charm: "cs:~charmed-osm/pol-3"
+    charm: "cs:~charmed-osm/pol-10"
     scale: 1
     series: kubernetes
     options:
@@ -133,7 +126,7 @@ applications:
       gui-x: -300
       gui-y: 500
   pla:
-    charm: "cs:~charmed-osm/pla-8"
+    charm: "cs:~charmed-osm/pla-13"
     scale: 1
     series: kubernetes
     options:
@@ -142,7 +135,7 @@ applications:
       gui-x: 600
       gui-y: -250
   prometheus:
-    charm: "cs:~charmed-osm/prometheus-2"
+    charm: "cs:~charmed-osm/prometheus-9"
     scale: 1
     series: kubernetes
     storage:
@@ -153,14 +146,14 @@ applications:
       gui-x: 300
       gui-y: 250
   grafana:
-    charm: "cs:~charmed-osm/grafana-2"
+    charm: "cs:~charmed-osm/grafana-10"
     scale: 1
     series: kubernetes
     annotations:
       gui-x: 300
       gui-y: 500
   keystone:
-    charm: "cs:~charmed-osm/keystone-7"
+    charm: "cs:~charmed-osm/keystone-16"
     scale: 1
     series: kubernetes
     annotations:
@@ -169,36 +162,36 @@ applications:
 relations:
   - - grafana:prometheus
     - prometheus:prometheus
-  - - kafka-k8s:zookeeper
-    - zookeeper-k8s:zookeeper
+  - - kafka:zookeeper
+    - zookeeper:zookeeper
   - - keystone:db
     - mariadb-k8s:mysql
   - - lcm:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - lcm:mongodb
-    - mongodb-k8s:mongo
+    - mongodb:database
   - - ro:ro
     - lcm:ro
   - - ro:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - ro:mongodb
-    - mongodb-k8s:mongo
+    - mongodb:database
   - - pol:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - pol:mongodb
-    - mongodb-k8s:mongo
+    - mongodb:database
   - - mon:mongodb
-    - mongodb-k8s:mongo
+    - mongodb:database
   - - mon:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - pla:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - pla:mongodb
-    - mongodb-k8s:mongo
+    - mongodb:database
   - - nbi:mongodb
-    - mongodb-k8s:mongo
+    - mongodb:database
   - - nbi:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - nbi:prometheus
     - prometheus:prometheus
   - - nbi:keystone
@@ -209,3 +202,7 @@ relations:
     - nbi:nbi
   - - mon:keystone
     - keystone:keystone
+  - - mariadb-k8s:mysql
+    - pol:mysql
+  - - grafana:db
+    - mariadb-k8s:mysql