X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fbundles%2Fosm-ha%2Fbundle.yaml;h=7d1a4469dddb46b0928b504fe7e4386cc3176277;hb=abef99c585c997ec39a2eba77cca75edef9880fd;hp=27af1073e8f9f02886c88757c0c3d8f2759c8203;hpb=c880c384873d058420d2e81c4a992715fcf03a3b;p=osm%2Fdevops.git

diff --git a/installers/charm/bundles/osm-ha/bundle.yaml b/installers/charm/bundles/osm-ha/bundle.yaml
index 27af1073..7d1a4469 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,84 +60,68 @@ applications:
     series: kubernetes
     storage:
       db: 50M
-    annotations:
-      gui-x: 0
-      gui-y: 0
   nbi:
     charm: osm-nbi
-    channel: latest/stable
+    channel: latest/beta
+    trust: true
     scale: 3
-    series: kubernetes
     options:
-      database_commonkey: osm
-      auth_backend: keystone
-      log_level: DEBUG
+      database-commonkey: osm
+      log-level: DEBUG
     resources:
-      image: opensourcemano/nbi:testing-daily
-    annotations:
-      gui-x: 0
-      gui-y: -250
+      nbi-image: opensourcemano/nbi:testing-daily
   ro:
     charm: osm-ro
-    channel: latest/stable
+    channel: latest/beta
+    trust: true
     scale: 3
-    series: kubernetes
     options:
-      log_level: DEBUG
+      log-level: DEBUG
     resources:
-      image: opensourcemano/ro:testing-daily
-    annotations:
-      gui-x: -300
-      gui-y: 250
+      ro-image: opensourcemano/ro:testing-daily
   ng-ui:
     charm: osm-ng-ui
-    channel: latest/stable
+    channel: latest/beta
+    trust: true
     scale: 3
-    series: kubernetes
     resources:
-      image: opensourcemano/ng-ui:testing-daily
-    annotations:
-      gui-x: 600
-      gui-y: 0
+      ng-ui-image: opensourcemano/ng-ui:testing-daily
   lcm:
     charm: osm-lcm
-    channel: latest/stable
+    channel: latest/beta
     scale: 3
-    series: kubernetes
     options:
-      database_commonkey: osm
-      log_level: DEBUG
+      database-commonkey: osm
+      log-level: DEBUG
     resources:
-      image: opensourcemano/lcm:testing-daily
-    annotations:
-      gui-x: -300
-      gui-y: 0
+      lcm-image: opensourcemano/lcm:testing-daily
   mon:
     charm: osm-mon
-    channel: latest/stable
+    channel: latest/beta
+    trust: true
     scale: 1
-    series: kubernetes
     options:
-      database_commonkey: osm
-      log_level: DEBUG
-      keystone_enabled: true
+      database-commonkey: osm
+      log-level: DEBUG
+      keystone-enabled: true
     resources:
-      image: opensourcemano/mon:testing-daily
-    annotations:
-      gui-x: 300
-      gui-y: 0
+      mon-image: opensourcemano/mon:testing-daily
   pol:
     charm: osm-pol
-    channel: latest/stable
+    channel: latest/beta
     scale: 3
-    series: kubernetes
     options:
-      log_level: DEBUG
+      log-level: DEBUG
     resources:
-      image: opensourcemano/pol:testing-daily
-    annotations:
-      gui-x: -300
-      gui-y: 500
+      pol-image: opensourcemano/pol:testing-daily
+  vca:
+    charm: osm-vca-integrator
+    channel: latest/beta
+    scale: 1
+  ingress:
+    charm: nginx-ingress-integrator
+    channel: latest/stable
+    scale: 3
   pla:
     charm: osm-pla
     channel: latest/stable
@@ -156,9 +131,6 @@ applications:
       log_level: DEBUG
     resources:
       image: opensourcemano/pla:testing-daily
-    annotations:
-      gui-x: 600
-      gui-y: -250
   prometheus:
     charm: osm-prometheus
     channel: latest/stable
@@ -168,26 +140,17 @@ applications:
       data: 50M
     options:
       default-target: "mon:8000"
-    annotations:
-      gui-x: 300
-      gui-y: 250
   grafana:
     charm: osm-grafana
     channel: latest/stable
     scale: 3
     series: kubernetes
-    annotations:
-      gui-x: 300
-      gui-y: 500
   keystone:
     charm: osm-keystone
     channel: latest/stable
     scale: 1
     resources:
       keystone-image: opensourcemano/keystone:testing-daily
-    annotations:
-      gui-x: 300
-      gui-y: -250
 relations:
   - - grafana:prometheus
     - prometheus:prometheus
@@ -199,6 +162,8 @@ relations:
     - kafka:kafka
   - - lcm:mongodb
     - mongodb:database
+  - - lcm:vca
+    - vca:vca
   - - ro:ro
     - lcm:ro
   - - ro:kafka
@@ -213,6 +178,8 @@ relations:
     - mongodb:database
   - - mon:kafka
     - kafka:kafka
+  - - mon:vca
+    - vca:vca
   - - pla:kafka
     - kafka:kafka
   - - pla:mongodb
@@ -221,6 +188,8 @@ relations:
     - mongodb:database
   - - nbi:kafka
     - kafka:kafka
+  - - nbi:ingress
+    - ingress:ingress
   - - nbi:prometheus
     - prometheus:prometheus
   - - nbi:keystone
@@ -229,6 +198,8 @@ relations:
     - prometheus:prometheus
   - - ng-ui:nbi
     - nbi:nbi
+  - - ng-ui:ingress
+    - ingress:ingress
   - - mon:keystone
     - keystone:keystone
   - - mariadb:mysql