X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fbundles%2Fosm%2Fbundle.yaml;h=1c19390da8ac3032e119190d0b572bcbf387694a;hb=ae03c5ba44b1b200c90927057d2f43fee0c01327;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..1c19390d 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,28 @@ 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
+      data: 100M
     annotations:
       gui-x: 0
       gui-y: 500
-  mariadb-k8s:
-    charm: "cs:~charmed-osm/mariadb-k8s"
-    channel: "stable"
+  kafka:
+    charm: kafka-k8s
+    channel: latest/stable
+    scale: 1
+    trust: true
+    storage:
+      data: 100M
+    annotations:
+      gui-x: 0
+      gui-y: 250
+  mariadb:
+    charm: charmed-osm-mariadb-k8s
     scale: 1
     series: kubernetes
     storage:
@@ -51,18 +60,9 @@ applications:
     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:
@@ -71,73 +71,95 @@ applications:
       gui-x: 0
       gui-y: 0
   nbi:
-    charm: "cs:~charmed-osm/nbi-16"
+    charm: osm-nbi
+    channel: 12.0/stable
     scale: 1
     series: kubernetes
     options:
       database_commonkey: osm
       auth_backend: keystone
       log_level: DEBUG
+    resources:
+      image: opensourcemano/nbi:12
     annotations:
       gui-x: 0
       gui-y: -250
   ro:
-    charm: "cs:~charmed-osm/ro-8"
+    charm: osm-ro
+    channel: 12.0/stable
     scale: 1
     series: kubernetes
     options:
       log_level: DEBUG
+    resources:
+      image: opensourcemano/ro:12
     annotations:
       gui-x: -300
       gui-y: 250
   ng-ui:
-    charm: "cs:~charmed-osm/ng-ui-23"
+    charm: osm-ng-ui
+    channel: 12.0/stable
     scale: 1
     series: kubernetes
+    resources:
+      image: opensourcemano/ng-ui:12
     annotations:
       gui-x: 600
       gui-y: 0
   lcm:
-    charm: "cs:~charmed-osm/lcm-13"
+    charm: osm-lcm
+    channel: 12.0/stable
     scale: 1
     series: kubernetes
     options:
       database_commonkey: osm
       log_level: DEBUG
+    resources:
+      image: opensourcemano/lcm:12
     annotations:
       gui-x: -300
       gui-y: 0
   mon:
-    charm: "cs:~charmed-osm/mon-9"
+    charm: osm-mon
+    channel: 12.0/stable
     scale: 1
     series: kubernetes
     options:
       database_commonkey: osm
       log_level: DEBUG
       keystone_enabled: true
+    resources:
+      image: opensourcemano/mon:12
     annotations:
       gui-x: 300
       gui-y: 0
   pol:
-    charm: "cs:~charmed-osm/pol-8"
+    charm: osm-pol
+    channel: 12.0/stable
     scale: 1
     series: kubernetes
     options:
       log_level: DEBUG
+    resources:
+      image: opensourcemano/pol:12
     annotations:
       gui-x: -300
       gui-y: 500
   pla:
-    charm: "cs:~charmed-osm/pla-11"
+    charm: osm-pla
+    channel: latest/stable
     scale: 1
     series: kubernetes
     options:
       log_level: DEBUG
+    resources:
+      image: opensourcemano/pla:12
     annotations:
       gui-x: 600
       gui-y: -250
   prometheus:
-    charm: "cs:~charmed-osm/prometheus-6"
+    charm: osm-prometheus
+    channel: 12.0/stable
     scale: 1
     series: kubernetes
     storage:
@@ -148,52 +170,55 @@ applications:
       gui-x: 300
       gui-y: 250
   grafana:
-    charm: "cs:~charmed-osm/grafana-6"
+    charm: osm-grafana
+    channel: 12.0/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
+    resources:
+      keystone-image: opensourcemano/keystone:12
     annotations:
       gui-x: 300
       gui-y: -250
 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
   - - 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
+    - kafka:kafka
   - - pla:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - pla:mongodb
     - mongodb:database
   - - nbi:mongodb
     - mongodb:database
   - - nbi:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - nbi:prometheus
     - prometheus:prometheus
   - - nbi:keystone
@@ -204,5 +229,7 @@ relations:
     - nbi:nbi
   - - mon:keystone
     - keystone:keystone
-  - - mariadb-k8s:mysql
+  - - mariadb:mysql
     - pol:mysql
+  - - grafana:db
+    - mariadb:mysql