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

diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml
index 58a97073..36322fe2 100644
--- a/installers/charm/bundles/osm/bundle.yaml
+++ b/installers/charm/bundles/osm/bundle.yaml
@@ -11,7 +11,20 @@
 #     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
+description: |
+  **Single instance Charmed OSM**
+
+  Charmed OSM is an OSM distribution, developed and maintained by Canonical, which uses
+  Juju charms to simplify its deployments and operations. This bundle distribution refers
+  to the development stack for OSM and allows you to deploy a single instance OSM bundle
+  that is fast, reliable, and a complete solution with MicroStack and MicroK8s.
+
+  - Industry‐aligned and fully compliant with upstream
+  - Predictable release cadence and upgrade path
+  - Simplified deployments and operations
+  - Stable and secure
+  - Supported with Ubuntu Advantage
+  - Availability of managed services
 bundle: kubernetes
 applications:
   zookeeper-k8s:
@@ -23,7 +36,7 @@ applications:
       database: 100M
     annotations:
       gui-x: 0
-      gui-y: 550
+      gui-y: 500
   mariadb-k8s:
     charm: "cs:~charmed-osm/mariadb-k8s"
     channel: "stable"
@@ -36,8 +49,8 @@ applications:
       root_password: osm4u
       user: mano
     annotations:
-      gui-x: -250
-      gui-y: -200
+      gui-x: -300
+      gui-y: -250
   kafka-k8s:
     charm: "cs:~charmed-osm/kafka-k8s"
     channel: "stable"
@@ -47,23 +60,18 @@ applications:
       database: 100M
     annotations:
       gui-x: 0
-      gui-y: 300
-  mongodb-k8s:
-    charm: "cs:~charmed-osm/mongodb-k8s"
-    channel: "stable"
+      gui-y: 250
+  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: "cs:~charmed-osm/nbi-5"
+    charm: "cs:~charmed-osm/nbi-16"
     scale: 1
     series: kubernetes
     options:
@@ -72,63 +80,64 @@ applications:
       log_level: DEBUG
     annotations:
       gui-x: 0
-      gui-y: -200
+      gui-y: -250
   ro:
-    charm: "cs:~charmed-osm/ro-0"
+    charm: "cs:~charmed-osm/ro-8"
     scale: 1
     series: kubernetes
     options:
       log_level: DEBUG
     annotations:
-      gui-x: -250
-      gui-y: 300
+      gui-x: -300
+      gui-y: 250
   ng-ui:
-    charm: "cs:~charmed-osm/ng-ui-16"
+    charm: "cs:~charmed-osm/ng-ui-23"
     scale: 1
     series: kubernetes
     annotations:
-      gui-x: 500
-      gui-y: 100
+      gui-x: 600
+      gui-y: 0
   lcm:
-    charm: "cs:~charmed-osm/lcm-0"
+    charm: "cs:~charmed-osm/lcm-13"
     scale: 1
     series: kubernetes
     options:
       database_commonkey: osm
       log_level: DEBUG
     annotations:
-      gui-x: -250
-      gui-y: 50
+      gui-x: -300
+      gui-y: 0
   mon:
-    charm: "cs:~charmed-osm/mon-0"
+    charm: "cs:~charmed-osm/mon-9"
     scale: 1
     series: kubernetes
     options:
       database_commonkey: osm
       log_level: DEBUG
+      keystone_enabled: true
     annotations:
-      gui-x: 250
-      gui-y: 50
+      gui-x: 300
+      gui-y: 0
   pol:
-    charm: "cs:~charmed-osm/pol-0"
+    charm: "cs:~charmed-osm/pol-8"
     scale: 1
     series: kubernetes
     options:
       log_level: DEBUG
     annotations:
-      gui-x: -250
-      gui-y: 550
+      gui-x: -300
+      gui-y: 500
   pla:
-    charm: "cs:~charmed-osm/pla-6"
+    charm: "cs:~charmed-osm/pla-11"
     scale: 1
     series: kubernetes
     options:
       log_level: DEBUG
     annotations:
-      gui-x: 500
-      gui-y: -200
+      gui-x: 600
+      gui-y: -250
   prometheus:
-    charm: "cs:~charmed-osm/prometheus-0"
+    charm: "cs:~charmed-osm/prometheus-6"
     scale: 1
     series: kubernetes
     storage:
@@ -136,22 +145,22 @@ applications:
     options:
       default-target: "mon:8000"
     annotations:
-      gui-x: 250
-      gui-y: 300
+      gui-x: 300
+      gui-y: 250
   grafana:
-    charm: "cs:~charmed-osm/grafana-0"
+    charm: "cs:~charmed-osm/grafana-6"
     scale: 1
     series: kubernetes
     annotations:
-      gui-x: 250
-      gui-y: 550
+      gui-x: 300
+      gui-y: 500
   keystone:
-    charm: "cs:~charmed-osm/keystone-4"
+    charm: "cs:~charmed-osm/keystone-12"
     scale: 1
     series: kubernetes
     annotations:
-      gui-x: -250
-      gui-y: 550
+      gui-x: 300
+      gui-y: -250
 relations:
   - - grafana:prometheus
     - prometheus:prometheus
@@ -162,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
@@ -193,3 +202,7 @@ relations:
     - prometheus:prometheus
   - - ng-ui:nbi
     - nbi:nbi
+  - - mon:keystone
+    - keystone:keystone
+  - - mariadb-k8s:mysql
+    - pol:mysql