X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fbundles%2Fosm-ha%2Fbundle.yaml;h=0469c1901c394415e7488f609ecf13efc7225f18;hb=0e79802ac825b95b375fc75f0e5be998e977f5b0;hp=cb361aeb312959e16c0452f3e18ee427565375b5;hpb=a43a22f50db90731e1c25279b721778240c2ce04;p=osm%2Fdevops.git

diff --git a/installers/charm/bundles/osm-ha/bundle.yaml b/installers/charm/bundles/osm-ha/bundle.yaml
index cb361aeb..0469c190 100644
--- a/installers/charm/bundles/osm-ha/bundle.yaml
+++ b/installers/charm/bundles/osm-ha/bundle.yaml
@@ -11,24 +11,39 @@
 #     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.
+name: osm-ha
 bundle: kubernetes
+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
 applications:
-  zookeeper-k8s:
-    charm: "cs:~charmed-osm/zookeeper-k8s"
-    channel: "stable"
+  zookeeper:
+    charm: zookeeper-k8s
+    channel: latest/stable
     scale: 3
-    series: kubernetes
     storage:
-      database: 100M
-    options:
-      zookeeper-units: 3
-    annotations:
-      gui-x: 0
-      gui-y: 550
-  mariadb-k8s:
-    charm: "cs:~charmed-osm/mariadb-k8s"
-    channel: "stable"
+      data: 100M
+  kafka:
+    charm: kafka-k8s
+    channel: latest/stable
+    scale: 3
+    trust: true
+    storage:
+      data: 100M
+  mariadb:
+    charm: charmed-osm-mariadb-k8s
     scale: 3
     series: kubernetes
     storage:
@@ -38,160 +53,130 @@ applications:
       root_password: osm4u
       user: mano
       ha-mode: true
-    annotations:
-      gui-x: -250
-      gui-y: -200
-  kafka-k8s:
-    charm: "cs:~charmed-osm/kafka-k8s"
-    channel: "stable"
-    scale: 3
-    series: kubernetes
-    storage:
-      database: 100M
-    options:
-      zookeeper-units: 3
-      kafka-units: 3
-    annotations:
-      gui-x: 0
-      gui-y: 300
-  mongodb-k8s:
-    charm: "cs:~charmed-osm/mongodb-k8s"
-    channel: "stable"
+  mongodb:
+    charm: mongodb-k8s
+    channel: latest/stable
     scale: 3
     series: kubernetes
     storage:
-      database: 50M
-    options:
-      replica-set: rs0
-      namespace: osm
-      enable-sidecar: true
-    annotations:
-      gui-x: 0
-      gui-y: 50
+      db: 50M
   nbi:
-    charm: "cs:~charmed-osm/nbi-5"
+    charm: osm-nbi
+    channel: v13.0/stable
+    trust: true
     scale: 3
-    series: kubernetes
     options:
-      database_commonkey: osm
-      auth_backend: keystone
-      log_level: DEBUG
-    annotations:
-      gui-x: 0
-      gui-y: -200
+      database-commonkey: osm
+      log-level: DEBUG
+    resources:
+      nbi-image: opensourcemano/nbi:testing-daily
   ro:
-    charm: "cs:~charmed-osm/ro-0"
+    charm: osm-ro
+    channel: v13.0/stable
+    trust: true
     scale: 3
-    series: kubernetes
     options:
-      log_level: DEBUG
-    annotations:
-      gui-x: -250
-      gui-y: 300
+      log-level: DEBUG
+    resources:
+      ro-image: opensourcemano/ro:testing-daily
   ng-ui:
-    charm: "cs:~charmed-osm/ng-ui-16"
+    charm: osm-ng-ui
+    channel: v13.0/stable
+    trust: true
     scale: 3
-    series: kubernetes
-    annotations:
-      gui-x: 500
-      gui-y: 100
+    resources:
+      ng-ui-image: opensourcemano/ng-ui:testing-daily
   lcm:
-    charm: "cs:~charmed-osm/lcm-0"
+    charm: osm-lcm
+    channel: v13.0/stable
     scale: 3
-    series: kubernetes
     options:
-      database_commonkey: osm
-      log_level: DEBUG
-    annotations:
-      gui-x: -250
-      gui-y: 50
+      database-commonkey: osm
+      log-level: DEBUG
+    resources:
+      lcm-image: opensourcemano/lcm:testing-daily
   mon:
-    charm: "cs:~charmed-osm/mon-0"
+    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: 250
-      gui-y: 50
+      database-commonkey: osm
+      log-level: DEBUG
+      keystone-enabled: true
+    resources:
+      mon-image: opensourcemano/mon:testing-daily
   pol:
-    charm: "cs:~charmed-osm/pol-0"
+    charm: osm-pol
+    channel: v13.0/stable
     scale: 3
-    series: kubernetes
     options:
-      log_level: DEBUG
-    annotations:
-      gui-x: -250
-      gui-y: 550
-  pla:
-    charm: "cs:~charmed-osm/pla-6"
+      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: 3
-    series: kubernetes
-    options:
-      log_level: DEBUG
-    annotations:
-      gui-x: 500
-      gui-y: -200
   prometheus:
-    charm: "cs:~charmed-osm/prometheus-0"
+    charm: osm-prometheus
+    channel: latest/stable
     scale: 1
     series: kubernetes
     storage:
       data: 50M
     options:
       default-target: "mon:8000"
-    annotations:
-      gui-x: 250
-      gui-y: 300
   grafana:
-    charm: "cs:~charmed-osm/grafana-0"
+    charm: osm-grafana
+    channel: latest/stable
     scale: 3
     series: kubernetes
-    annotations:
-      gui-x: 250
-      gui-y: 550
   keystone:
-    charm: "cs:~charmed-osm/keystone-4"
+    charm: osm-keystone
+    channel: latest/stable
     scale: 1
-    series: kubernetes
-    annotations:
-      gui-x: -250
-      gui-y: 550
+    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-k8s:mongo
+    - mongodb:database
+  - - lcm:vca
+    - vca:vca
   - - ro:ro
     - lcm:ro
   - - ro:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
   - - ro:mongodb
-    - mongodb-k8s:mongo
+    - mongodb:database
   - - pol:kafka
-    - kafka-k8s:kafka
+    - kafka: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
+    - kafka:kafka
+  - - mon:vca
+    - vca:vca
   - - nbi:mongodb
-    - mongodb-k8s:mongo
+    - mongodb:database
   - - nbi:kafka
-    - kafka-k8s:kafka
+    - kafka:kafka
+  - - nbi:ingress
+    - ingress:ingress
   - - nbi:prometheus
     - prometheus:prometheus
   - - nbi:keystone
@@ -200,5 +185,11 @@ relations:
     - prometheus:prometheus
   - - ng-ui:nbi
     - nbi:nbi
+  - - ng-ui:ingress
+    - ingress:ingress
   - - mon:keystone
     - keystone:keystone
+  - - mariadb:mysql
+    - pol:mysql
+  - - grafana:db
+    - mariadb:mysql