X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=installers%2Fcharm%2Fbundles%2Fosm-ha%2Fbundle.yaml;h=2d49421622e04b9dc98c8dff5e0b50ba1cdc098f;hb=refs%2Fchanges%2F23%2F11023%2F3;hp=80695431435a1f5bc0ac6021d4e07af3a71fa13c;hpb=49379ced23b5e344a773ce77ac9cb59c1864e19b;p=osm%2Fdevops.git

diff --git a/installers/charm/bundles/osm-ha/bundle.yaml b/installers/charm/bundles/osm-ha/bundle.yaml
index 80695431..2d494216 100644
--- a/installers/charm/bundles/osm-ha/bundle.yaml
+++ b/installers/charm/bundles/osm-ha/bundle.yaml
@@ -11,7 +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: A high-available OSM cluster.
+description: |
+  **A high-available Charmed OSM cluster**
+
+  Charmed OSM is an OSM distribution, developed and maintained by Canonical, which uses
+  Juju charms to simplify its deployments and operations. This bundle distribution enables
+  TSPs to easily deploy pure upstream OSM in highly available, production-grade, and
+  scalable clusters.
+
+  - Industry‐aligned and fully compliant with upstream
+  - Predictable release cadence and upgrade path
+  - Simplified deployments and operations
+  - Stable and secure
+  - Highly Available and resilient against failures
+  - Supported with Ubuntu Advantage
+  - Availability of managed services
 bundle: kubernetes
 applications:
   zookeeper-k8s:
@@ -25,7 +39,7 @@ applications:
       zookeeper-units: 3
     annotations:
       gui-x: 0
-      gui-y: 550
+      gui-y: 500
   mariadb-k8s:
     charm: "cs:~charmed-osm/mariadb-k8s"
     channel: "stable"
@@ -39,8 +53,8 @@ applications:
       user: mano
       ha-mode: true
     annotations:
-      gui-x: -250
-      gui-y: -200
+      gui-x: -300
+      gui-y: -250
   kafka-k8s:
     charm: "cs:~charmed-osm/kafka-k8s"
     channel: "stable"
@@ -53,7 +67,7 @@ applications:
       kafka-units: 3
     annotations:
       gui-x: 0
-      gui-y: 300
+      gui-y: 250
   mongodb-k8s:
     charm: "cs:~charmed-osm/mongodb-k8s"
     channel: "stable"
@@ -67,9 +81,9 @@ applications:
       enable-sidecar: true
     annotations:
       gui-x: 0
-      gui-y: 50
+      gui-y: 0
   nbi:
-    charm: "cs:~charmed-osm/nbi-5"
+    charm: "cs:~charmed-osm/nbi-12"
     scale: 3
     series: kubernetes
     options:
@@ -78,63 +92,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-4"
     scale: 3
     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-21"
     scale: 3
     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-8"
     scale: 3
     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-5"
     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-4"
     scale: 3
     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-9"
     scale: 3
     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-4"
     scale: 1
     series: kubernetes
     storage:
@@ -142,22 +157,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-4"
     scale: 3
     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-10"
     scale: 1
     series: kubernetes
     annotations:
-      gui-x: -250
-      gui-y: 550
+      gui-x: 300
+      gui-y: -250
 relations:
   - - grafana:prometheus
     - prometheus:prometheus
@@ -199,3 +214,7 @@ relations:
     - prometheus:prometheus
   - - ng-ui:nbi
     - nbi:nbi
+  - - mon:keystone
+    - keystone:keystone
+  - - mariadb-k8s:mysql
+    - pol:mysql