Update from master

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

diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml
index f9fc6b9..e2c336d 100644 (file)
--- a/installers/charm/bundles/osm/bundle.yaml
+++ b/installers/charm/bundles/osm/bundle.yaml
@@ -13,6 +13,7 @@
 #     limitations under the License.
 name: osm
 bundle: kubernetes
+docs: https://discourse.charmhub.io/t/osm-docs-index/8806
 description: |
   **Single instance Charmed OSM**
 
@@ -53,14 +54,15 @@ applications:
       user: mano
   mongodb:
     charm: mongodb-k8s
-    channel: latest/stable
+    channel: latest/edge
     scale: 1
     series: kubernetes
     storage:
       db: 50M
   nbi:
     charm: osm-nbi
-    channel: latest/beta
+    channel: latest/edge/paas
+    series: focal
     trust: true
     scale: 1
     options:
@@ -86,7 +88,8 @@ applications:
       ng-ui-image: opensourcemano/ng-ui:testing-daily
   lcm:
     charm: osm-lcm
-    channel: latest/beta
+    channel: latest/edge/paas
+    series: focal
     scale: 1
     options:
       database-commonkey: osm
@@ -120,15 +123,6 @@ applications:
     charm: nginx-ingress-integrator
     channel: latest/stable
     scale: 1
-  pla:
-    charm: osm-pla
-    channel: latest/stable
-    scale: 1
-    series: kubernetes
-    options:
-      log_level: DEBUG
-    resources:
-      image: opensourcemano/pla:testing-daily
   prometheus:
     charm: osm-prometheus
     channel: latest/stable
@@ -149,6 +143,13 @@ applications:
     scale: 1
     resources:
       keystone-image: opensourcemano/keystone:testing-daily
+  temporal:
+    charm: osm-temporal
+    channel: latest/edge
+    series: focal
+    scale: 1
+    resources:
+      temporal-server-image: temporalio/auto-setup:1.20.0
 relations:
   - - grafana:prometheus
     - prometheus:prometheus
@@ -178,10 +179,6 @@ relations:
     - kafka:kafka
   - - mon:vca
     - vca:vca
-  - - pla:kafka
-    - kafka:kafka
-  - - pla:mongodb
-    - mongodb:database
   - - nbi:mongodb
     - mongodb:database
   - - nbi:kafka
@@ -192,6 +189,8 @@ relations:
     - prometheus:prometheus
   - - nbi:keystone
     - keystone:keystone
+  - - nbi:temporal
+    - temporal:temporal
   - - mon:prometheus
     - prometheus:prometheus
   - - ng-ui:nbi
@@ -204,3 +203,5 @@ relations:
     - pol:mysql
   - - grafana:db
     - mariadb:mysql
+  - - temporal:db
+    - mariadb:mysql