X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fbundles%2Fosm%2Fbundle.yaml;h=c0e5b58764caf053c02a00ae53d51f6d634c299b;hb=0e79802ac825b95b375fc75f0e5be998e977f5b0;hp=36322fe24db77d896e8ddbbddd443a7234c476ce;hpb=d680be4f261d4c580fcdf75abe11cfc29003915d;p=osm%2Fdevops.git

diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml
index 36322fe2..c0e5b587 100644
--- a/installers/charm/bundles/osm/bundle.yaml
+++ b/installers/charm/bundles/osm/bundle.yaml
@@ -11,6 +11,8 @@
 #     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.
+name: osm
+bundle: kubernetes
 description: |
   **Single instance Charmed OSM**
 
@@ -25,21 +27,22 @@ description: |
   - Stable and secure
   - Supported with Ubuntu Advantage
   - Availability of managed services
-bundle: kubernetes
 applications:
-  zookeeper-k8s:
-    charm: "cs:~charmed-osm/zookeeper-k8s"
-    channel: "stable"
+  zookeeper:
+    charm: zookeeper-k8s
+    channel: latest/stable
     scale: 1
-    series: kubernetes
     storage:
-      database: 100M
-    annotations:
-      gui-x: 0
-      gui-y: 500
-  mariadb-k8s:
-    charm: "cs:~charmed-osm/mariadb-k8s"
-    channel: "stable"
+      data: 100M
+  kafka:
+    charm: kafka-k8s
+    channel: latest/stable
+    scale: 1
+    trust: true
+    storage:
+      data: 100M
+  mariadb:
+    charm: charmed-osm-mariadb-k8s
     scale: 1
     series: kubernetes
     storage:
@@ -48,152 +51,130 @@ applications:
       password: manopw
       root_password: osm4u
       user: mano
-    annotations:
-      gui-x: -300
-      gui-y: -250
-  kafka-k8s:
-    charm: "cs:~charmed-osm/kafka-k8s"
-    channel: "stable"
-    scale: 1
-    series: kubernetes
-    storage:
-      database: 100M
-    annotations:
-      gui-x: 0
-      gui-y: 250
   mongodb:
-    charm: ch:mongodb-k8s
+    charm: mongodb-k8s
+    channel: latest/stable
     scale: 1
     series: kubernetes
     storage:
       db: 50M
-    annotations:
-      gui-x: 0
-      gui-y: 0
   nbi:
-    charm: "cs:~charmed-osm/nbi-16"
+    charm: osm-nbi
+    channel: v13.0/stable
+    trust: true
     scale: 1
-    series: kubernetes
     options:
-      database_commonkey: osm
-      auth_backend: keystone
-      log_level: DEBUG
-    annotations:
-      gui-x: 0
-      gui-y: -250
+      database-commonkey: osm
+      log-level: DEBUG
+    resources:
+      nbi-image: opensourcemano/nbi:testing-daily
   ro:
-    charm: "cs:~charmed-osm/ro-8"
+    charm: osm-ro
+    channel: v13.0/stable
+    trust: true
     scale: 1
-    series: kubernetes
     options:
-      log_level: DEBUG
-    annotations:
-      gui-x: -300
-      gui-y: 250
+      log-level: DEBUG
+    resources:
+      ro-image: opensourcemano/ro:testing-daily
   ng-ui:
-    charm: "cs:~charmed-osm/ng-ui-23"
+    charm: osm-ng-ui
+    channel: v13.0/stable
+    trust: true
     scale: 1
-    series: kubernetes
-    annotations:
-      gui-x: 600
-      gui-y: 0
+    resources:
+      ng-ui-image: opensourcemano/ng-ui:testing-daily
   lcm:
-    charm: "cs:~charmed-osm/lcm-13"
+    charm: osm-lcm
+    channel: v13.0/stable
     scale: 1
-    series: kubernetes
     options:
-      database_commonkey: osm
-      log_level: DEBUG
-    annotations:
-      gui-x: -300
-      gui-y: 0
+      database-commonkey: osm
+      log-level: DEBUG
+    resources:
+      lcm-image: opensourcemano/lcm:testing-daily
   mon:
-    charm: "cs:~charmed-osm/mon-9"
+    charm: osm-mon
+    channel: v13.0/stable
+    trust: true
     scale: 1
-    series: kubernetes
     options:
-      database_commonkey: osm
-      log_level: DEBUG
-      keystone_enabled: true
-    annotations:
-      gui-x: 300
-      gui-y: 0
+      database-commonkey: osm
+      log-level: DEBUG
+      keystone-enabled: true
+    resources:
+      mon-image: opensourcemano/mon:testing-daily
   pol:
-    charm: "cs:~charmed-osm/pol-8"
+    charm: osm-pol
+    channel: v13.0/stable
     scale: 1
-    series: kubernetes
     options:
-      log_level: DEBUG
-    annotations:
-      gui-x: -300
-      gui-y: 500
-  pla:
-    charm: "cs:~charmed-osm/pla-11"
+      log-level: DEBUG
+    resources:
+      pol-image: opensourcemano/pol:testing-daily
+  vca:
+    charm: osm-vca-integrator
+    channel: v13.0/stable
+    scale: 1
+  ingress:
+    charm: nginx-ingress-integrator
+    channel: latest/stable
     scale: 1
-    series: kubernetes
-    options:
-      log_level: DEBUG
-    annotations:
-      gui-x: 600
-      gui-y: -250
   prometheus:
-    charm: "cs:~charmed-osm/prometheus-6"
+    charm: osm-prometheus
+    channel: latest/stable
     scale: 1
     series: kubernetes
     storage:
       data: 50M
     options:
       default-target: "mon:8000"
-    annotations:
-      gui-x: 300
-      gui-y: 250
   grafana:
-    charm: "cs:~charmed-osm/grafana-6"
+    charm: osm-grafana
+    channel: latest/stable
     scale: 1
     series: kubernetes
-    annotations:
-      gui-x: 300
-      gui-y: 500
   keystone:
-    charm: "cs:~charmed-osm/keystone-12"
+    charm: osm-keystone
+    channel: latest/stable
     scale: 1
-    series: kubernetes
-    annotations:
-      gui-x: 300
-      gui-y: -250
+    resources:
+      keystone-image: opensourcemano/keystone:testing-daily
 relations:
   - - grafana:prometheus
     - prometheus:prometheus
-  - - kafka-k8s:zookeeper
-    - zookeeper-k8s:zookeeper
+  - - kafka:zookeeper
+    - zookeeper:zookeeper
   - - keystone:db
-    - mariadb-k8s:mysql
+    - mariadb:mysql
   - - lcm:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - lcm:mongodb
     - mongodb:database
+  - - lcm:vca
+    - vca:vca
   - - ro:ro
     - lcm:ro
   - - ro:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - ro:mongodb
     - mongodb:database
   - - pol:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - pol:mongodb
     - mongodb:database
   - - mon:mongodb
     - mongodb:database
   - - mon:kafka
-    - kafka-k8s:kafka
-  - - pla:kafka
-    - kafka-k8s:kafka
-  - - pla:mongodb
-    - mongodb:database
+    - kafka:kafka
+  - - mon:vca
+    - vca:vca
   - - nbi:mongodb
     - mongodb:database
   - - nbi:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
+  - - nbi:ingress
+    - ingress:ingress
   - - nbi:prometheus
     - prometheus:prometheus
   - - nbi:keystone
@@ -202,7 +183,11 @@ relations:
     - prometheus:prometheus
   - - ng-ui:nbi
     - nbi:nbi
+  - - ng-ui:ingress
+    - ingress:ingress
   - - mon:keystone
     - keystone:keystone
-  - - mariadb-k8s:mysql
+  - - mariadb:mysql
     - pol:mysql
+  - - grafana:db
+    - mariadb:mysql