X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fbundles%2Fosm-ha%2Fbundle.yaml;h=ff666c025c9db7def036dc976a3cec17443cfa88;hb=481ae7d606286c40e775fddd17146285a7d1a3cc;hp=f395830ebf984f3e81a884edbace205f997b9c3d;hpb=5863d3e8d8dca5108d89b993d5eb019ab16df587;p=osm%2Fdevops.git

diff --git a/installers/charm/bundles/osm-ha/bundle.yaml b/installers/charm/bundles/osm-ha/bundle.yaml
index f395830e..ff666c02 100644
--- a/installers/charm/bundles/osm-ha/bundle.yaml
+++ b/installers/charm/bundles/osm-ha/bundle.yaml
@@ -82,8 +82,7 @@ applications:
       gui-x: 0
       gui-y: 50
   nbi-k8s:
-    charm: "cs:~charmed-osm/nbi-k8s"
-    channel: "%(channel)s"
+    charm: "%(prefix)s/nbi-k8s%(suffix)s"
     scale: 3
     series: kubernetes
     storage:
@@ -91,12 +90,12 @@ applications:
     options:
       log_level: "INFO"
       DATABASE_COMMONKEY: osm
+      auth-backend: keystone
     annotations:
       gui-x: 0
       gui-y: -200
   ro-k8s:
-    charm: "cs:~charmed-osm/ro-k8s"
-    channel: "%(channel)s"
+    charm: "%(prefix)s/ro-k8s%(suffix)s"
     scale: 3
     series: kubernetes
     storage:
@@ -108,19 +107,20 @@ applications:
     annotations:
       gui-x: -250
       gui-y: 300
-  ui-k8s:
-    charm: "cs:~charmed-osm/ui-k8s"
-    channel: "%(channel)s"
+  ng-ui:
+    charm: "%(prefix)s/ng-ui%(suffix)s"
     scale: 3
     series: kubernetes
     options:
-      mysql_database: lwui
+      port: 80
+      https_port: 443
+      server_name: localhost
+      client_max_body_size: 15M
     annotations:
-      gui-x: 250
-      gui-y: -200
+      gui-x: 500
+      gui-y: 100
   lcm-k8s:
-    charm: "cs:~charmed-osm/lcm-k8s"
-    channel: "%(channel)s"
+    charm: "%(prefix)s/lcm-k8s%(suffix)s"
     scale: 3
     series: kubernetes
     storage:
@@ -132,16 +132,14 @@ applications:
       vca_password: secret
       vca_pubkey: pubkey
       vca_cacert: cacert
-      vca_apiproxy: apiproxy
       use_external_vca: true
       DATABASE_COMMONKEY: osm
     annotations:
       gui-x: -250
       gui-y: 50
   mon-k8s:
-    charm: "cs:~charmed-osm/mon-k8s"
-    channel: "%(channel)s"
-    scale: 3
+    charm: "%(prefix)s/mon-k8s%(suffix)s"
+    scale: 1
     series: kubernetes
     storage:
       database: 100M
@@ -161,8 +159,7 @@ applications:
       gui-x: 250
       gui-y: 50
   pol-k8s:
-    charm: "cs:~charmed-osm/pol-k8s"
-    channel: "%(channel)s"
+    charm: "%(prefix)s/pol-k8s%(suffix)s"
     scale: 3
     series: kubernetes
     storage:
@@ -172,9 +169,8 @@ applications:
     annotations:
       gui-x: -250
       gui-y: 550
-  pla-k8s:
+  pla:
     charm: "%(prefix)s/pla%(suffix)s"
-    channel: "%(channel)s"
     scale: 3
     series: kubernetes
     annotations:
@@ -183,7 +179,7 @@ applications:
   prometheus-k8s:
     charm: "cs:~charmed-osm/prometheus-k8s"
     channel: "stable"
-    scale: 3
+    scale: 1
     series: kubernetes
     storage:
       database: 100M
@@ -202,6 +198,14 @@ applications:
     annotations:
       gui-x: 250
       gui-y: 550
+  keystone:
+    charm: '%(prefix)s/keystone%(suffix)s'
+    channel: '%(channel)s'
+    scale: 1
+    series: kubernetes
+    annotations:
+      gui-x: -250
+      gui-y: 550
 
 relations:
   - - "kafka-k8s:zookeeper"
@@ -230,15 +234,19 @@ relations:
     - "mon-k8s:prometheus"
   - - "grafana-k8s:prometheus"
     - "prometheus-k8s:prometheus"
-  - - "ui-k8s:mysql"
-    - "mariadb-k8s:mysql"
-  - - "ui-k8s:nbi"
-    - "nbi-k8s:nbi"
   - - "prometheus-k8s:prometheus"
     - "nbi-k8s:prometheus"
   - - "pla:kafka"
     - "kafka-k8s:kafka"
   - - "pla:mongo"
     - "mongodb-k8s:mongo"
-  - - "pla:mysql"
-    - "mariadb-k8s:mysql"
+  - - 'ng-ui:nbi'
+    - 'nbi-k8s:nbi'
+  - - 'keystone:db'
+    - 'mariadb-k8s:mysql'
+  - - 'keystone:keystone'
+    - 'nbi-k8s:keystone'
+  - - "ro-k8s:mongo"
+    - "mongodb-k8s:mongo"
+  - - "ro-k8s:kafka"
+    - "kafka-k8s:kafka"