Fix bug 1778 - Adding openstack client to Keystone dockerfile

[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..216718d 100644 (file)
--- a/installers/charm/local_osm_bundle.yaml
+++ b/installers/charm/local_osm_bundle.yaml
@@ -14,13 +14,14 @@
 description: Single instance OSM bundle
 bundle: kubernetes
 applications:
-  zookeeper-k8s:
-    charm: "cs:~charmed-osm/zookeeper-k8s"
-    channel: "stable"
+  zookeeper:
+    charm: "./zookeeper/zookeeper.charm"
     scale: 1
     series: kubernetes
     storage:
       database: 100M
+    resources:
+      image: rocks.canonical.com:443/k8s.gcr.io/kubernetes-zookeeper:1.0-3.4.10
     annotations:
       gui-x: 0
       gui-y: 550
@@ -38,88 +39,98 @@ applications:
     annotations:
       gui-x: -250
       gui-y: -200
-  kafka-k8s:
-    charm: "cs:~charmed-osm/kafka-k8s"
-    channel: "stable"
+  kafka:
+    charm: "./kafka/kafka.charm"
     scale: 1
     series: kubernetes
     storage:
       database: 100M
+    resources:
+      image: rocks.canonical.com:443/wurstmeister/kafka:2.12-2.2.1
     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
   pla:
-    charm: "./pla/build"
+    charm: "./pla/pla.charm"
     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 +138,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:
@@ -148,36 +166,36 @@ applications:
 relations:
   - - grafana:prometheus
     - prometheus:prometheus
-  - - kafka-k8s:zookeeper
-    - zookeeper-k8s:zookeeper
+  - - kafka:zookeeper
+    - zookeeper:zookeeper
   - - keystone:db
     - mariadb-k8s:mysql
   - - lcm:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - lcm:mongodb
-    - mongodb-k8s:mongo
+    - mongodb:database
   - - ro:ro
     - lcm:ro
   - - ro:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - ro:mongodb
-    - mongodb-k8s:mongo
+    - mongodb:database
   - - pol:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - pol:mongodb
-    - mongodb-k8s:mongo
+    - mongodb:database
   - - mon:mongodb
-    - mongodb-k8s:mongo
+    - mongodb:database
   - - mon:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - pla:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - pla:mongodb
-    - mongodb-k8s:mongo
+    - mongodb:database
   - - nbi:mongodb
-    - mongodb-k8s:mongo
+    - mongodb:database
   - - nbi:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - nbi:prometheus
     - prometheus:prometheus
   - - nbi:keystone
@@ -186,3 +204,9 @@ relations:
     - prometheus:prometheus
   - - ng-ui:nbi
     - nbi:nbi
+  - - mon:keystone
+    - keystone:keystone
+  - - mariadb-k8s:mysql
+    - pol:mysql
+  - - mariadb-k8s:mysql
+    - grafana:db