Fix bug 1765: update to latest charm revisions (Charmed installer)

[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 9ee7195..36d1b37 100644 (file)
--- a/installers/charm/bundles/osm-ha/bundle.yaml
+++ b/installers/charm/bundles/osm-ha/bundle.yaml
@@ -28,8 +28,8 @@ description: |
   - Availability of managed services
 bundle: kubernetes
 applications:
-  zookeeper-k8s:
-    charm: "cs:~charmed-osm/zookeeper-k8s"
+  zookeeper:
+    charm: "cs:~charmed-osm/zookeeper-0"
     channel: "stable"
     scale: 3
     series: kubernetes
@@ -55,8 +55,8 @@ applications:
     annotations:
       gui-x: -300
       gui-y: -250
-  kafka-k8s:
-    charm: "cs:~charmed-osm/kafka-k8s"
+  kafka:
+    charm: "cs:~charmed-osm/kafka-0"
     channel: "stable"
     scale: 3
     series: kubernetes
@@ -68,22 +68,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: 3
     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-6"
+    charm: "cs:~charmed-osm/nbi-17"
     scale: 3
     series: kubernetes
     options:
@@ -94,7 +89,7 @@ applications:
       gui-x: 0
       gui-y: -250
   ro:
-    charm: "cs:~charmed-osm/ro-1"
+    charm: "cs:~charmed-osm/ro-9"
     scale: 3
     series: kubernetes
     options:
@@ -103,14 +98,14 @@ applications:
       gui-x: -300
       gui-y: 250
   ng-ui:
-    charm: "cs:~charmed-osm/ng-ui-17"
+    charm: "cs:~charmed-osm/ng-ui-24"
     scale: 3
     series: kubernetes
     annotations:
       gui-x: 600
       gui-y: 0
   lcm:
-    charm: "cs:~charmed-osm/lcm-2"
+    charm: "cs:~charmed-osm/lcm-14"
     scale: 3
     series: kubernetes
     options:
@@ -120,7 +115,7 @@ applications:
       gui-x: -300
       gui-y: 0
   mon:
-    charm: "cs:~charmed-osm/mon-2"
+    charm: "cs:~charmed-osm/mon-11"
     scale: 1
     series: kubernetes
     options:
@@ -131,7 +126,7 @@ applications:
       gui-x: 300
       gui-y: 0
   pol:
-    charm: "cs:~charmed-osm/pol-1"
+    charm: "cs:~charmed-osm/pol-9"
     scale: 3
     series: kubernetes
     options:
@@ -140,7 +135,7 @@ applications:
       gui-x: -300
       gui-y: 500
   pla:
-    charm: "cs:~charmed-osm/pla-7"
+    charm: "cs:~charmed-osm/pla-12"
     scale: 3
     series: kubernetes
     options:
@@ -149,7 +144,7 @@ applications:
       gui-x: 600
       gui-y: -250
   prometheus:
-    charm: "cs:~charmed-osm/prometheus-1"
+    charm: "cs:~charmed-osm/prometheus-8"
     scale: 1
     series: kubernetes
     storage:
@@ -160,14 +155,14 @@ applications:
       gui-x: 300
       gui-y: 250
   grafana:
-    charm: "cs:~charmed-osm/grafana-1"
+    charm: "cs:~charmed-osm/grafana-9"
     scale: 3
     series: kubernetes
     annotations:
       gui-x: 300
       gui-y: 500
   keystone:
-    charm: "cs:~charmed-osm/keystone-5"
+    charm: "cs:~charmed-osm/keystone-15"
     scale: 1
     series: kubernetes
     annotations:
@@ -176,36 +171,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
@@ -216,3 +211,7 @@ relations:
     - nbi:nbi
   - - mon:keystone
     - keystone:keystone
+  - - mariadb-k8s:mysql
+    - pol:mysql
+  - - grafana:db
+    - mariadb-k8s:mysql