X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fbundles%2Fosm-ha%2Fbundle.yaml;h=36d1b37dc764d820f2c3e167a6d54b5d95aff3d4;hb=72ac65cee3fd3307338c96036f5c0ed06daa3617;hp=a7ebc38f1210a360e62f6c3873d455efbd0adbf9;hpb=847febf8619c2d3a3a66afef14fe794fdf02d8d5;p=osm%2Fdevops.git

diff --git a/installers/charm/bundles/osm-ha/bundle.yaml b/installers/charm/bundles/osm-ha/bundle.yaml
index a7ebc38f..36d1b37d 100644
--- 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
@@ -78,7 +78,7 @@ applications:
       gui-x: 0
       gui-y: 0
   nbi:
-    charm: "cs:~charmed-osm/nbi-16"
+    charm: "cs:~charmed-osm/nbi-17"
     scale: 3
     series: kubernetes
     options:
@@ -89,7 +89,7 @@ applications:
       gui-x: 0
       gui-y: -250
   ro:
-    charm: "cs:~charmed-osm/ro-8"
+    charm: "cs:~charmed-osm/ro-9"
     scale: 3
     series: kubernetes
     options:
@@ -98,14 +98,14 @@ applications:
       gui-x: -300
       gui-y: 250
   ng-ui:
-    charm: "cs:~charmed-osm/ng-ui-23"
+    charm: "cs:~charmed-osm/ng-ui-24"
     scale: 3
     series: kubernetes
     annotations:
       gui-x: 600
       gui-y: 0
   lcm:
-    charm: "cs:~charmed-osm/lcm-13"
+    charm: "cs:~charmed-osm/lcm-14"
     scale: 3
     series: kubernetes
     options:
@@ -115,7 +115,7 @@ applications:
       gui-x: -300
       gui-y: 0
   mon:
-    charm: "cs:~charmed-osm/mon-9"
+    charm: "cs:~charmed-osm/mon-11"
     scale: 1
     series: kubernetes
     options:
@@ -126,7 +126,7 @@ applications:
       gui-x: 300
       gui-y: 0
   pol:
-    charm: "cs:~charmed-osm/pol-8"
+    charm: "cs:~charmed-osm/pol-9"
     scale: 3
     series: kubernetes
     options:
@@ -135,7 +135,7 @@ applications:
       gui-x: -300
       gui-y: 500
   pla:
-    charm: "cs:~charmed-osm/pla-11"
+    charm: "cs:~charmed-osm/pla-12"
     scale: 3
     series: kubernetes
     options:
@@ -144,7 +144,7 @@ applications:
       gui-x: 600
       gui-y: -250
   prometheus:
-    charm: "cs:~charmed-osm/prometheus-6"
+    charm: "cs:~charmed-osm/prometheus-8"
     scale: 1
     series: kubernetes
     storage:
@@ -155,14 +155,14 @@ applications:
       gui-x: 300
       gui-y: 250
   grafana:
-    charm: "cs:~charmed-osm/grafana-6"
+    charm: "cs:~charmed-osm/grafana-9"
     scale: 3
     series: kubernetes
     annotations:
       gui-x: 300
       gui-y: 500
   keystone:
-    charm: "cs:~charmed-osm/keystone-12"
+    charm: "cs:~charmed-osm/keystone-15"
     scale: 1
     series: kubernetes
     annotations:
@@ -171,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:database
   - - ro:ro
     - lcm:ro
   - - ro:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - ro:mongodb
     - mongodb:database
   - - pol:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - pol:mongodb
     - mongodb:database
   - - mon:mongodb
     - mongodb:database
   - - mon:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - pla:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - pla:mongodb
     - mongodb:database
   - - nbi:mongodb
     - mongodb:database
   - - nbi:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - nbi:prometheus
     - prometheus:prometheus
   - - nbi:keystone
@@ -213,3 +213,5 @@ relations:
     - keystone:keystone
   - - mariadb-k8s:mysql
     - pol:mysql
+  - - grafana:db
+    - mariadb-k8s:mysql