CharmHub and new kafka and zookeeper charms

[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 202ee2b..f20e598 100644 (file)
--- a/installers/charm/bundles/osm-ha/bundle.yaml
+++ b/installers/charm/bundles/osm-ha/bundle.yaml
@@ -30,17 +30,24 @@ description: |
   - Availability of managed services
 applications:
   zookeeper:
-    charm: osm-zookeeper
+    charm: zookeeper-k8s
     channel: latest/edge
     scale: 3
-    series: kubernetes
     storage:
-      database: 100M
-    options:
-      zookeeper-units: 3
+      data: 100M
     annotations:
       gui-x: 0
       gui-y: 500
+  kafka:
+    charm: kafka-k8s
+    channel: latest/edge
+    scale: 3
+    trust: true
+    storage:
+      data: 100M
+    annotations:
+      gui-x: 0
+      gui-y: 250
   mariadb:
     charm: charmed-osm-mariadb-k8s
     scale: 3
@@ -55,19 +62,6 @@ applications:
     annotations:
       gui-x: -300
       gui-y: -250
-  kafka:
-    charm: osm-kafka
-    channel: latest/edge
-    scale: 3
-    series: kubernetes
-    storage:
-      database: 100M
-    options:
-      zookeeper-units: 3
-      kafka-units: 3
-    annotations:
-      gui-x: 0
-      gui-y: 250
   mongodb:
     charm: mongodb-k8s
     channel: latest/stable
@@ -87,6 +81,8 @@ applications:
       database_commonkey: osm
       auth_backend: keystone
       log_level: DEBUG
+    resources:
+      image: opensourcemano/nbi:testing-daily
     annotations:
       gui-x: 0
       gui-y: -250
@@ -97,6 +93,8 @@ applications:
     series: kubernetes
     options:
       log_level: DEBUG
+    resources:
+      image: opensourcemano/ro:testing-daily
     annotations:
       gui-x: -300
       gui-y: 250
@@ -105,6 +103,8 @@ applications:
     channel: latest/edge
     scale: 3
     series: kubernetes
+    resources:
+      image: opensourcemano/ng-ui:testing-daily
     annotations:
       gui-x: 600
       gui-y: 0
@@ -116,6 +116,8 @@ applications:
     options:
       database_commonkey: osm
       log_level: DEBUG
+    resources:
+      image: opensourcemano/lcm:testing-daily
     annotations:
       gui-x: -300
       gui-y: 0
@@ -128,6 +130,8 @@ applications:
       database_commonkey: osm
       log_level: DEBUG
       keystone_enabled: true
+    resources:
+      image: opensourcemano/mon:testing-daily
     annotations:
       gui-x: 300
       gui-y: 0
@@ -138,6 +142,8 @@ applications:
     series: kubernetes
     options:
       log_level: DEBUG
+    resources:
+      image: opensourcemano/pol:testing-daily
     annotations:
       gui-x: -300
       gui-y: 500
@@ -148,6 +154,8 @@ applications:
     series: kubernetes
     options:
       log_level: DEBUG
+    resources:
+      image: opensourcemano/pla:testing-daily
     annotations:
       gui-x: 600
       gui-y: -250
@@ -175,6 +183,8 @@ applications:
     charm: osm-keystone
     channel: latest/edge
     scale: 1
+    resources:
+      keystone-image: opensourcemano/keystone:testing-daily
     annotations:
       gui-x: 300
       gui-y: -250