Add secret-management in Charmed OSM

[osm/devops.git] / installers / charm / local_osm_bundle.yaml

diff --git a/installers/charm/local_osm_bundle.yaml b/installers/charm/local_osm_bundle.yaml
index 4b4f809..e8198eb 100644 (file)
--- a/installers/charm/local_osm_bundle.yaml
+++ b/installers/charm/local_osm_bundle.yaml
@@ -48,66 +48,73 @@ applications:
     annotations:
       gui-x: 0
       gui-y: 300
-  mongodb-k8s:
-    charm: "cs:~charmed-osm/mongodb-k8s"
-    channel: "stable"
+  mongodb:
+    charm: ch:mongodb-k8s
     scale: 1
     series: kubernetes
     storage:
-      database: 50M
-    options:
-      replica-set: rs0
-      namespace: osm
-      enable-sidecar: true
+      db: 50M
     annotations:
       gui-x: 0
-      gui-y: 50
+      gui-y: 0
   nbi:
-    charm: "./nbi/build"
+    charm: "./nbi/nbi.charm"
     scale: 1
     series: kubernetes
     options:
       database_commonkey: osm
       auth_backend: keystone
+    resources:
+      image: opensourcemano/nbi:testing-daily
     annotations:
       gui-x: 0
       gui-y: -200
   ro:
-    charm: "./ro/build"
+    charm: "./ro/ro.charm"
     scale: 1
     series: kubernetes
+    resources:
+      image: opensourcemano/ro:testing-daily
     annotations:
       gui-x: -250
       gui-y: 300
   ng-ui:
-    charm: "./ng-ui/build"
+    charm: "./ng-ui/ng-ui.charm"
     scale: 1
     series: kubernetes
+    resources:
+      image: opensourcemano/ng-ui:testing-daily
     annotations:
       gui-x: 500
       gui-y: 100
   lcm:
-    charm: "./lcm/build"
+    charm: "./lcm/lcm.charm"
     scale: 1
     series: kubernetes
     options:
       database_commonkey: osm
+    resources:
+      image: opensourcemano/lcm:testing-daily
     annotations:
       gui-x: -250
       gui-y: 50
   mon:
-    charm: "./mon/build"
+    charm: "./mon/mon.charm"
     scale: 1
     series: kubernetes
     options:
       database_commonkey: osm
+    resources:
+      image: opensourcemano/mon:testing-daily
     annotations:
       gui-x: 250
       gui-y: 50
   pol:
-    charm: "./pol/build"
+    charm: "./pol/pol.charm"
     scale: 1
     series: kubernetes
+    resources:
+      image: opensourcemano/pol:testing-daily
     annotations:
       gui-x: -250
       gui-y: 550
@@ -115,11 +122,13 @@ applications:
     charm: "./pla/build"
     scale: 1
     series: kubernetes
+    resources:
+      image: opensourcemano/pla:testing-daily
     annotations:
       gui-x: 500
       gui-y: -200
   prometheus:
-    charm: "./prometheus/build"
+    charm: "./prometheus/prometheus.charm"
     channel: "stable"
     scale: 1
     series: kubernetes
@@ -127,19 +136,26 @@ applications:
       data: 50M
     options:
       default-target: "mon:8000"
+    resources:
+      image: ubuntu/prometheus:latest
+      backup-image: ed1000/prometheus-backup:latest
     annotations:
       gui-x: 250
       gui-y: 300
   grafana:
-    charm: "./grafana/build"
+    charm: "./grafana/grafana.charm"
     channel: "stable"
     scale: 1
     series: kubernetes
+    resources:
+      image: ubuntu/grafana:latest
     annotations:
       gui-x: 250
       gui-y: 550
   keystone:
-    charm: "./keystone/build"
+    charm: "./keystone/keystone.charm"
+    resources:
+      image: opensourcemano/keystone:testing-daily
     scale: 1
     series: kubernetes
     annotations:
@@ -155,27 +171,27 @@ relations:
   - - lcm:kafka
     - kafka-k8s:kafka
   - - lcm:mongodb
-    - mongodb-k8s:mongo
+    - mongodb:database
   - - ro:ro
     - lcm:ro
   - - ro:kafka
     - kafka-k8s:kafka
   - - ro:mongodb
-    - mongodb-k8s:mongo
+    - mongodb:database
   - - pol:kafka
     - kafka-k8s:kafka
   - - pol:mongodb
-    - mongodb-k8s:mongo
+    - mongodb:database
   - - mon:mongodb
-    - mongodb-k8s:mongo
+    - mongodb:database
   - - mon:kafka
     - kafka-k8s:kafka
   - - pla:kafka
     - kafka-k8s:kafka
   - - pla:mongodb
-    - mongodb-k8s:mongo
+    - mongodb:database
   - - nbi:mongodb
-    - mongodb-k8s:mongo
+    - mongodb:database
   - - nbi:kafka
     - kafka-k8s:kafka
   - - nbi:prometheus
@@ -186,3 +202,7 @@ relations:
     - prometheus:prometheus
   - - ng-ui:nbi
     - nbi:nbi
+  - - mon:keystone
+    - keystone:keystone
+  - - mariadb-k8s:mysql
+    - pol:mysql