Merge branch 'master' into paas

[osm/devops.git] / installers / charm / bundles / osm-ha / bundle.yaml

diff --git a/installers/charm/bundles/osm-ha/bundle.yaml b/installers/charm/bundles/osm-ha/bundle.yaml
index 7d1a446..08cd281 100644 (file)
--- a/installers/charm/bundles/osm-ha/bundle.yaml
+++ b/installers/charm/bundles/osm-ha/bundle.yaml
@@ -62,7 +62,8 @@ applications:
       db: 50M
   nbi:
     charm: osm-nbi
-    channel: latest/beta
+    channel: latest/edge/paas
+    series: focal
     trust: true
     scale: 3
     options:
@@ -88,7 +89,8 @@ applications:
       ng-ui-image: opensourcemano/ng-ui:testing-daily
   lcm:
     charm: osm-lcm
-    channel: latest/beta
+    channel: latest/edge/paas
+    series: focal
     scale: 3
     options:
       database-commonkey: osm
@@ -122,15 +124,6 @@ applications:
     charm: nginx-ingress-integrator
     channel: latest/stable
     scale: 3
-  pla:
-    charm: osm-pla
-    channel: latest/stable
-    scale: 3
-    series: kubernetes
-    options:
-      log_level: DEBUG
-    resources:
-      image: opensourcemano/pla:testing-daily
   prometheus:
     charm: osm-prometheus
     channel: latest/stable
@@ -151,6 +144,13 @@ applications:
     scale: 1
     resources:
       keystone-image: opensourcemano/keystone:testing-daily
+  temporal:
+    charm: osm-temporal
+    channel: latest/edge/paas
+    series: focal
+    scale: 3
+    resources:
+      temporal-server-image: temporalio/auto-setup:1.19.0
 relations:
   - - grafana:prometheus
     - prometheus:prometheus
@@ -180,10 +180,6 @@ relations:
     - kafka:kafka
   - - mon:vca
     - vca:vca
-  - - pla:kafka
-    - kafka:kafka
-  - - pla:mongodb
-    - mongodb:database
   - - nbi:mongodb
     - mongodb:database
   - - nbi:kafka
@@ -194,6 +190,8 @@ relations:
     - prometheus:prometheus
   - - nbi:keystone
     - keystone:keystone
+  - - nbi:temporal
+    - temporal:temporal
   - - mon:prometheus
     - prometheus:prometheus
   - - ng-ui:nbi
@@ -206,3 +204,5 @@ relations:
     - pol:mysql
   - - grafana:db
     - mariadb:mysql
+  - - temporal:db
+    - mariadb:mysql