X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Flocal_osm_bundle.yaml;h=6ab0df6be38f46951d48f7dabe434b368c136073;hb=refs%2Fchanges%2F95%2F11695%2F6;hp=216718dece16bcd9e162564856489aeeba695b64;hpb=d326e879ade43b12055f37c5deab6972b2674f47;p=osm%2Fdevops.git

diff --git a/installers/charm/local_osm_bundle.yaml b/installers/charm/local_osm_bundle.yaml
index 216718de..6ab0df6b 100644
--- a/installers/charm/local_osm_bundle.yaml
+++ b/installers/charm/local_osm_bundle.yaml
@@ -11,23 +11,21 @@
 #     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 #     See the License for the specific language governing permissions and
 #     limitations under the License.
-description: Single instance OSM bundle
+name: osm
 bundle: kubernetes
+description: Local bundle for development
 applications:
   zookeeper:
-    charm: "./zookeeper/zookeeper.charm"
+    charm: zookeeper-k8s
+    channel: latest/edge
     scale: 1
-    series: kubernetes
     storage:
-      database: 100M
-    resources:
-      image: rocks.canonical.com:443/k8s.gcr.io/kubernetes-zookeeper:1.0-3.4.10
+      data: 100M
     annotations:
       gui-x: 0
-      gui-y: 550
-  mariadb-k8s:
-    charm: "cs:~charmed-osm/mariadb-k8s"
-    channel: "stable"
+      gui-y: 500
+  mariadb:
+    charm: charmed-osm-mariadb-k8s
     scale: 1
     series: kubernetes
     storage:
@@ -37,21 +35,21 @@ applications:
       root_password: osm4u
       user: mano
     annotations:
-      gui-x: -250
-      gui-y: -200
+      gui-x: -300
+      gui-y: -250
   kafka:
-    charm: "./kafka/kafka.charm"
+    charm: kafka-k8s
+    channel: latest/edge
     scale: 1
-    series: kubernetes
+    trust: true
     storage:
-      database: 100M
-    resources:
-      image: rocks.canonical.com:443/wurstmeister/kafka:2.12-2.2.1
+      data: 100M
     annotations:
       gui-x: 0
-      gui-y: 300
+      gui-y: 250
   mongodb:
-    charm: ch:mongodb-k8s
+    charm: mongodb-k8s
+    channel: latest/stable
     scale: 1
     series: kubernetes
     storage:
@@ -60,116 +58,121 @@ applications:
       gui-x: 0
       gui-y: 0
   nbi:
-    charm: "./nbi/nbi.charm"
+    charm: ./nbi/osm-nbi.charm
     scale: 1
+    resources:
+      image: opensourcemano/nbi:testing-daily
     series: kubernetes
     options:
       database_commonkey: osm
       auth_backend: keystone
-    resources:
-      image: opensourcemano/nbi:testing-daily
+      log_level: DEBUG
     annotations:
       gui-x: 0
-      gui-y: -200
+      gui-y: -250
   ro:
-    charm: "./ro/ro.charm"
+    charm: ./ro/osm-ro.charm
     scale: 1
-    series: kubernetes
     resources:
       image: opensourcemano/ro:testing-daily
+    series: kubernetes
+    options:
+      log_level: DEBUG
     annotations:
-      gui-x: -250
-      gui-y: 300
+      gui-x: -300
+      gui-y: 250
   ng-ui:
-    charm: "./ng-ui/ng-ui.charm"
+    charm: ./ng-ui/osm-ng-ui.charm
     scale: 1
-    series: kubernetes
     resources:
       image: opensourcemano/ng-ui:testing-daily
+    series: kubernetes
     annotations:
-      gui-x: 500
-      gui-y: 100
+      gui-x: 600
+      gui-y: 0
   lcm:
-    charm: "./lcm/lcm.charm"
+    charm: ./lcm/osm-lcm.charm
     scale: 1
+    resources:
+      image: opensourcemano/lcm:testing-daily
     series: kubernetes
     options:
       database_commonkey: osm
-    resources:
-      image: opensourcemano/lcm:testing-daily
+      log_level: DEBUG
     annotations:
-      gui-x: -250
-      gui-y: 50
+      gui-x: -300
+      gui-y: 0
   mon:
-    charm: "./mon/mon.charm"
+    charm: ./mon/osm-mon.charm
     scale: 1
+    resources:
+      image: opensourcemano/mon:testing-daily
     series: kubernetes
     options:
       database_commonkey: osm
-    resources:
-      image: opensourcemano/mon:testing-daily
+      log_level: DEBUG
+      keystone_enabled: true
     annotations:
-      gui-x: 250
-      gui-y: 50
+      gui-x: 300
+      gui-y: 0
   pol:
-    charm: "./pol/pol.charm"
+    charm: ./pol/osm-pol.charm
     scale: 1
-    series: kubernetes
     resources:
       image: opensourcemano/pol:testing-daily
+    series: kubernetes
+    options:
+      log_level: DEBUG
     annotations:
-      gui-x: -250
-      gui-y: 550
+      gui-x: -300
+      gui-y: 500
   pla:
-    charm: "./pla/pla.charm"
+    charm: ./pla/osm-pla.charm
     scale: 1
-    series: kubernetes
     resources:
       image: opensourcemano/pla:testing-daily
+    series: kubernetes
+    options:
+      log_level: DEBUG
     annotations:
-      gui-x: 500
-      gui-y: -200
+      gui-x: 600
+      gui-y: -250
   prometheus:
-    charm: "./prometheus/prometheus.charm"
-    channel: "stable"
+    charm: osm-prometheus
+    channel: latest/edge
     scale: 1
     series: kubernetes
     storage:
       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
+      gui-x: 300
+      gui-y: 250
   grafana:
-    charm: "./grafana/grafana.charm"
-    channel: "stable"
+    charm: osm-grafana
+    channel: latest/edge
     scale: 1
     series: kubernetes
-    resources:
-      image: ubuntu/grafana:latest
     annotations:
-      gui-x: 250
-      gui-y: 550
+      gui-x: 300
+      gui-y: 500
   keystone:
-    charm: "./keystone/keystone.charm"
+    charm: osm-keystone
+    channel: latest/edge
     resources:
-      image: opensourcemano/keystone:testing-daily
+      keystone-image: opensourcemano/keystone:testing-daily
     scale: 1
-    series: kubernetes
     annotations:
-      gui-x: -250
-      gui-y: 550
+      gui-x: 300
+      gui-y: -250
 relations:
   - - grafana:prometheus
     - prometheus:prometheus
   - - kafka:zookeeper
     - zookeeper:zookeeper
   - - keystone:db
-    - mariadb-k8s:mysql
+    - mariadb:mysql
   - - lcm:kafka
     - kafka:kafka
   - - lcm:mongodb
@@ -206,7 +209,7 @@ relations:
     - nbi:nbi
   - - mon:keystone
     - keystone:keystone
-  - - mariadb-k8s:mysql
+  - - mariadb:mysql
     - pol:mysql
-  - - mariadb-k8s:mysql
-    - grafana:db
+  - - grafana:db
+    - mariadb:mysql