X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fbundles%2Fosm%2Fbundle.yaml;h=edac6c93f8e59cd087f55aa7dc889ad86649499e;hb=refs%2Fchanges%2F48%2F12448%2F1;hp=fa367dc51108c25f845bb3af9fbd95af9686708f;hpb=53a09d8a21b6b4c2a3e17ce302c3aec4b220b040;p=osm%2Fdevops.git

diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml
index fa367dc5..edac6c93 100644
--- a/installers/charm/bundles/osm/bundle.yaml
+++ b/installers/charm/bundles/osm/bundle.yaml
@@ -29,15 +29,24 @@ description: |
   - Availability of managed services
 applications:
   zookeeper:
-    charm: osm-zookeeper
+    charm: zookeeper-k8s
     channel: latest/edge
     scale: 1
-    series: kubernetes
     storage:
-      database: 100M
+      data: 100M
     annotations:
       gui-x: 0
       gui-y: 500
+  kafka:
+    charm: kafka-k8s
+    channel: latest/edge
+    scale: 1
+    trust: true
+    storage:
+      data: 100M
+    annotations:
+      gui-x: 0
+      gui-y: 250
   mariadb:
     charm: charmed-osm-mariadb-k8s
     scale: 1
@@ -51,16 +60,6 @@ applications:
     annotations:
       gui-x: -300
       gui-y: -250
-  kafka:
-    charm: osm-kafka
-    channel: latest/edge
-    scale: 1
-    series: kubernetes
-    storage:
-      database: 100M
-    annotations:
-      gui-x: 0
-      gui-y: 250
   mongodb:
     charm: mongodb-k8s
     channel: latest/stable
@@ -73,80 +72,94 @@ applications:
       gui-y: 0
   nbi:
     charm: osm-nbi
-    channel: latest/edge
+    channel: latest/stable
     scale: 1
     series: kubernetes
     options:
       database_commonkey: osm
       auth_backend: keystone
       log_level: DEBUG
+    resources:
+      image: opensourcemano/nbi:testing-daily
     annotations:
       gui-x: 0
       gui-y: -250
   ro:
     charm: osm-ro
-    channel: latest/edge
+    channel: latest/stable
     scale: 1
     series: kubernetes
     options:
       log_level: DEBUG
+    resources:
+      image: opensourcemano/ro:testing-daily
     annotations:
       gui-x: -300
       gui-y: 250
   ng-ui:
     charm: osm-ng-ui
-    channel: latest/edge
+    channel: latest/stable
     scale: 1
     series: kubernetes
+    resources:
+      image: opensourcemano/ng-ui:testing-daily
     annotations:
       gui-x: 600
       gui-y: 0
   lcm:
     charm: osm-lcm
-    channel: latest/edge
+    channel: latest/stable
     scale: 1
     series: kubernetes
     options:
       database_commonkey: osm
       log_level: DEBUG
+    resources:
+      image: opensourcemano/lcm:testing-daily
     annotations:
       gui-x: -300
       gui-y: 0
   mon:
     charm: osm-mon
-    channel: latest/edge
+    channel: latest/stable
     scale: 1
     series: kubernetes
     options:
       database_commonkey: osm
       log_level: DEBUG
       keystone_enabled: true
+    resources:
+      image: opensourcemano/mon:testing-daily
     annotations:
       gui-x: 300
       gui-y: 0
   pol:
     charm: osm-pol
-    channel: latest/edge
+    channel: latest/stable
     scale: 1
     series: kubernetes
     options:
       log_level: DEBUG
+    resources:
+      image: opensourcemano/pol:testing-daily
     annotations:
       gui-x: -300
       gui-y: 500
   pla:
     charm: osm-pla
-    channel: latest/edge
+    channel: latest/stable
     scale: 1
     series: kubernetes
     options:
       log_level: DEBUG
+    resources:
+      image: opensourcemano/pla:testing-daily
     annotations:
       gui-x: 600
       gui-y: -250
   prometheus:
     charm: osm-prometheus
-    channel: latest/edge
+    channel: latest/stable
     scale: 1
     series: kubernetes
     storage:
@@ -158,7 +171,7 @@ applications:
       gui-y: 250
   grafana:
     charm: osm-grafana
-    channel: latest/edge
+    channel: latest/stable
     scale: 1
     series: kubernetes
     annotations:
@@ -166,8 +179,10 @@ applications:
       gui-y: 500
   keystone:
     charm: osm-keystone
-    channel: latest/edge
+    channel: latest/stable
     scale: 1
+    resources:
+      keystone-image: opensourcemano/keystone:testing-daily
     annotations:
       gui-x: 300
       gui-y: -250