X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fbundles%2Fosm-ha%2Fbundle.yaml;h=9d28fe564995beb08441cba7466baf2df7ceaadb;hb=2882e3e1b7f1e710cc1274216290eb3083969966;hp=9d3f3120dd9e0750b34dd5f0a3dd1d2350e0cb02;hpb=ea458f66e66f4f7b26491636a8d28da6d64c5e3a;p=osm%2Fdevops.git

diff --git a/installers/charm/bundles/osm-ha/bundle.yaml b/installers/charm/bundles/osm-ha/bundle.yaml
index 9d3f3120..9d28fe56 100644
--- a/installers/charm/bundles/osm-ha/bundle.yaml
+++ b/installers/charm/bundles/osm-ha/bundle.yaml
@@ -31,23 +31,17 @@ description: |
 applications:
   zookeeper:
     charm: zookeeper-k8s
-    channel: latest/edge
+    channel: latest/stable
     scale: 3
     storage:
       data: 100M
-    annotations:
-      gui-x: 0
-      gui-y: 500
   kafka:
     charm: kafka-k8s
-    channel: latest/edge
+    channel: latest/stable
     scale: 3
     trust: true
     storage:
       data: 100M
-    annotations:
-      gui-x: 0
-      gui-y: 250
   mariadb:
     charm: charmed-osm-mariadb-k8s
     scale: 3
@@ -59,9 +53,6 @@ applications:
       root_password: osm4u
       user: mano
       ha-mode: true
-    annotations:
-      gui-x: -300
-      gui-y: -250
   mongodb:
     charm: mongodb-k8s
     channel: latest/stable
@@ -69,12 +60,9 @@ applications:
     series: kubernetes
     storage:
       db: 50M
-    annotations:
-      gui-x: 0
-      gui-y: 0
   nbi:
     charm: osm-nbi
-    channel: latest/edge
+    channel: latest/candidate
     scale: 3
     series: kubernetes
     options:
@@ -82,48 +70,36 @@ applications:
       auth_backend: keystone
       log_level: DEBUG
     resources:
-      image: opensourcemano/nbi:10.0.3
-    annotations:
-      gui-x: 0
-      gui-y: -250
+      image: opensourcemano/nbi:10
   ro:
     charm: osm-ro
-    channel: latest/edge
+    channel: latest/candidate
     scale: 3
     series: kubernetes
     options:
       log_level: DEBUG
     resources:
-      image: opensourcemano/ro:10.0.3
-    annotations:
-      gui-x: -300
-      gui-y: 250
+      image: opensourcemano/ro:10
   ng-ui:
     charm: osm-ng-ui
-    channel: latest/edge
+    channel: latest/candidate
     scale: 3
     series: kubernetes
     resources:
-      image: opensourcemano/ng-ui:10.0.3
-    annotations:
-      gui-x: 600
-      gui-y: 0
+      image: opensourcemano/ng-ui:10
   lcm:
     charm: osm-lcm
-    channel: latest/edge
+    channel: latest/candidate
     scale: 3
     series: kubernetes
     options:
       database_commonkey: osm
       log_level: DEBUG
     resources:
-      image: opensourcemano/lcm:10.0.3
-    annotations:
-      gui-x: -300
-      gui-y: 0
+      image: opensourcemano/lcm:10
   mon:
     charm: osm-mon
-    channel: latest/edge
+    channel: latest/candidate
     scale: 1
     series: kubernetes
     options:
@@ -131,63 +107,45 @@ applications:
       log_level: DEBUG
       keystone_enabled: true
     resources:
-      image: opensourcemano/mon:10.0.3
-    annotations:
-      gui-x: 300
-      gui-y: 0
+      image: opensourcemano/mon:10
   pol:
     charm: osm-pol
-    channel: latest/edge
+    channel: latest/candidate
     scale: 3
     series: kubernetes
     options:
       log_level: DEBUG
     resources:
-      image: opensourcemano/pol:10.0.3
-    annotations:
-      gui-x: -300
-      gui-y: 500
+      image: opensourcemano/pol:10
   pla:
     charm: osm-pla
-    channel: latest/edge
+    channel: latest/candidate
     scale: 3
     series: kubernetes
     options:
       log_level: DEBUG
     resources:
-      image: opensourcemano/pla:10.0.3
-    annotations:
-      gui-x: 600
-      gui-y: -250
+      image: opensourcemano/pla:10
   prometheus:
     charm: osm-prometheus
-    channel: latest/edge
+    channel: latest/candidate
     scale: 1
     series: kubernetes
     storage:
       data: 50M
     options:
       default-target: "mon:8000"
-    annotations:
-      gui-x: 300
-      gui-y: 250
   grafana:
     charm: osm-grafana
-    channel: latest/edge
+    channel: latest/candidate
     scale: 3
     series: kubernetes
-    annotations:
-      gui-x: 300
-      gui-y: 500
   keystone:
     charm: osm-keystone
-    channel: latest/edge
+    channel: latest/candidate
     scale: 1
     resources:
-      keystone-image: opensourcemano/keystone:releaseten-daily
-    annotations:
-      gui-x: 300
-      gui-y: -250
+      keystone-image: opensourcemano/keystone:10
 relations:
   - - grafana:prometheus
     - prometheus:prometheus