X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fbundles%2Fosm-ha%2Fbundle.yaml;h=a4e84d31472d68fda384c52d842ae538d0015912;hb=81db82cd6d2cb2a1c4ea5d156f2ef9134c776bf7;hp=f60082e058bcb8870f4b4252cb640db0bf138956;hpb=b1a1c46a60aa4981c7b01e9d6ff95958db7749a5;p=osm%2Fdevops.git

diff --git a/installers/charm/bundles/osm-ha/bundle.yaml b/installers/charm/bundles/osm-ha/bundle.yaml
index f60082e0..a4e84d31 100644
--- a/installers/charm/bundles/osm-ha/bundle.yaml
+++ b/installers/charm/bundles/osm-ha/bundle.yaml
@@ -11,27 +11,40 @@
 #     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
+docs: https://discourse.charmhub.io/t/osm-docs-index/8806
+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:
-      # client-port: 2181
-      server-port: 2888
-      leader-election-port: 3888
-      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:
@@ -40,230 +53,144 @@ applications:
       password: manopw
       root_password: osm4u
       user: mano
-      database: database
-      mysql_port: "3306"
-      query-cache-type: "OFF"
-      query-cache-size: 0
       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: 200M
-    options:
-      advertised-hostname: "kafka-k8s"
-      advertised-port: 9092
-      kafka-units: 3
-      zookeeper-units: 3
-      zookeeper-service-name: zookeeper-k8s-endpoints
-    annotations:
-      gui-x: 0
-      gui-y: 300
-  mongodb-k8s:
-    charm: "cs:~charmed-osm/mongodb-k8s"
-    channel: "stable"
+  mongodb:
+    charm: mongodb-k8s
+    channel: 5/edge
     scale: 3
     series: kubernetes
     storage:
-      database: 300M
-    options:
-      advertised-port: 27017
-      replica-set: rs0
-      namespace: osm
-      service-name: mongodb-k8s-endpoints
-      cluster-domain: cluster.local
-      enable-sidecar: true
-    annotations:
-      gui-x: 0
-      gui-y: 50
-  nbi-k8s:
-    charm: "%(prefix)s/nbi-k8s%(suffix)s"
-    channel: "%(channel)s"
+      mongodb: 50M
+  nbi:
+    charm: osm-nbi
+    channel: latest/beta
+    trust: true
     scale: 3
-    series: kubernetes
-    storage:
-      packages: 100M
     options:
-      log_level: "INFO"
-      DATABASE_COMMONKEY: osm
-      auth-backend: keystone
-    annotations:
-      gui-x: 0
-      gui-y: -200
-  ro-k8s:
-    charm: "%(prefix)s/ro-k8s%(suffix)s"
-    channel: "%(channel)s"
+      database-commonkey: osm
+      log-level: DEBUG
+    resources:
+      nbi-image: opensourcemano/nbi:testing-daily
+  ro:
+    charm: osm-ro
+    channel: latest/beta
+    trust: true
     scale: 3
-    series: kubernetes
-    storage:
-      log: 50M
     options:
-      vim_database: "mano_vim_db"
-      ro_database: "mano_db"
-      OPENMANO_TENANT: "osm"
-    annotations:
-      gui-x: -250
-      gui-y: 300
-  ui-k8s:
-    charm: "%(prefix)s/ui-k8s%(suffix)s"
-    channel: "%(channel)s"
-    scale: 3
-    series: kubernetes
-    options:
-      mysql_database: lwui
-    annotations:
-      gui-x: 250
-      gui-y: -200
+      log-level: DEBUG
+    resources:
+      ro-image: opensourcemano/ro:testing-daily
   ng-ui:
-    charm: "%(prefix)s/ng-ui%(suffix)s"
-    channel: "%(channel)s"
+    charm: osm-ng-ui
+    channel: latest/beta
+    trust: true
     scale: 3
-    series: kubernetes
-    options:
-      port: 80
-      https_port: 443
-      server_name: localhost
-      client_max_body_size: 15M
-    annotations:
-      gui-x: 500
-      gui-y: 100
-  lcm-k8s:
-    charm: "%(prefix)s/lcm-k8s%(suffix)s"
-    channel: "%(channel)s"
+    resources:
+      ng-ui-image: opensourcemano/ng-ui:testing-daily
+  lcm:
+    charm: osm-lcm
+    channel: latest/beta
     scale: 3
-    series: kubernetes
-    storage:
-      packages: 100M
     options:
-      vca_host: vca
-      vca_port: 17070
-      vca_user: admin
-      vca_password: secret
-      vca_pubkey: pubkey
-      vca_cacert: cacert
-      use_external_vca: true
-      DATABASE_COMMONKEY: osm
-    annotations:
-      gui-x: -250
-      gui-y: 50
-  mon-k8s:
-    charm: "%(prefix)s/mon-k8s%(suffix)s"
-    channel: "%(channel)s"
-    scale: 3
-    series: kubernetes
-    storage:
-      database: 100M
+      database-commonkey: osm
+      log-level: DEBUG
+    resources:
+      lcm-image: opensourcemano/lcm:testing-daily
+  mon:
+    charm: osm-mon
+    channel: latest/beta
+    trust: true
+    scale: 1
     options:
-      OSMMON_OPENSTACK_DEFAULT_GRANULARITY: 300
-      OSMMON_GLOBAL_REQUEST_TIMEOUT: 10
-      OSMMON_GLOBAL_LOGLEVEL: INFO
-      OSMMON_DATABASE_COMMONKEY: osm
-      OSMMON_COLLECTOR_INTERVAL: 30
-      OSMMON_EVALUATOR_INTERVAL: 30
-      vca_host: vca
-      vca_user: admin
-      vca_password: secret
-      vca_cacert: cacert
-      use_external_vca: true
-    annotations:
-      gui-x: 250
-      gui-y: 50
-  pol-k8s:
-    charm: "%(prefix)s/pol-k8s%(suffix)s"
-    channel: "%(channel)s"
+      database-commonkey: osm
+      log-level: DEBUG
+      keystone-enabled: true
+    resources:
+      mon-image: opensourcemano/mon:testing-daily
+  pol:
+    charm: osm-pol
+    channel: latest/beta
     scale: 3
-    series: kubernetes
-    storage:
-      database: 100M
     options:
-      log_level: INFO
-    annotations:
-      gui-x: -250
-      gui-y: 550
-  pla:
-    charm: "%(prefix)s/pla%(suffix)s"
-    channel: "%(channel)s"
-    scale: 3
-    series: kubernetes
-    annotations:
-      gui-x: 500
-      gui-y: -200
-  prometheus-k8s:
-    charm: "cs:~charmed-osm/prometheus-k8s"
-    channel: "stable"
+      log-level: DEBUG
+    resources:
+      pol-image: opensourcemano/pol:testing-daily
+  vca:
+    charm: osm-vca-integrator
+    channel: latest/beta
+    scale: 1
+  ingress:
+    charm: nginx-ingress-integrator
+    channel: latest/stable
     scale: 3
+  prometheus:
+    charm: osm-prometheus
+    channel: latest/stable
+    scale: 1
     series: kubernetes
     storage:
-      database: 100M
+      data: 50M
     options:
-      advertised-port: 9090
-      web-subpath: /
-      default-target: "mon-k8s:8000"
-    annotations:
-      gui-x: 250
-      gui-y: 300
-  grafana-k8s:
-    charm: "cs:~charmed-osm/grafana-k8s"
-    channel: "stable"
+      default-target: "mon:8000"
+  grafana:
+    charm: osm-grafana
+    channel: latest/stable
     scale: 3
     series: kubernetes
-    annotations:
-      gui-x: 250
-      gui-y: 550
   keystone:
-    charm: '%(prefix)s/keystone%(suffix)s'
-    channel: '%(channel)s'
+    charm: osm-keystone
+    channel: latest/beta
     scale: 1
-    series: kubernetes
-    annotations:
-      gui-x: -250
-      gui-y: 550
-
+    resources:
+      keystone-image: opensourcemano/keystone:testing-daily
 relations:
-  - - "kafka-k8s:zookeeper"
-    - "zookeeper-k8s:zookeeper"
-  - - "ro-k8s:mysql"
-    - "mariadb-k8s:mysql"
-  - - "nbi-k8s:mongo"
-    - "mongodb-k8s:mongo"
-  - - "nbi-k8s:kafka"
-    - "kafka-k8s:kafka"
-  - - "lcm-k8s:kafka"
-    - "kafka-k8s:kafka"
-  - - "lcm-k8s:mongo"
-    - "mongodb-k8s:mongo"
-  - - "mon-k8s:kafka"
-    - "kafka-k8s:kafka"
-  - - "mon-k8s:mongo"
-    - "mongodb-k8s:mongo"
-  - - "pol-k8s:kafka"
-    - "kafka-k8s:kafka"
-  - - "pol-k8s:mongo"
-    - "mongodb-k8s:mongo"
-  - - "lcm-k8s:ro"
-    - "ro-k8s:ro"
-  - - "prometheus-k8s:prometheus"
-    - "mon-k8s:prometheus"
-  - - "grafana-k8s:prometheus"
-    - "prometheus-k8s:prometheus"
-  - - "ui-k8s:mysql"
-    - "mariadb-k8s:mysql"
-  - - "ui-k8s:nbi"
-    - "nbi-k8s:nbi"
-  - - "prometheus-k8s:prometheus"
-    - "nbi-k8s:prometheus"
-  - - "pla:kafka"
-    - "kafka-k8s:kafka"
-  - - "pla:mongo"
-    - "mongodb-k8s:mongo"
-  - - 'ng-ui:nbi'
-    - 'nbi-k8s:nbi'
-  - - 'keystone:db'
-    - 'mariadb-k8s:mysql'
-  - - 'keystone:keystone'
-    - 'nbi-k8s:keystone'
+  - - grafana:prometheus
+    - prometheus:prometheus
+  - - kafka:zookeeper
+    - zookeeper:zookeeper
+  - - keystone:db
+    - mariadb:mysql
+  - - lcm:kafka
+    - kafka:kafka
+  - - lcm:mongodb
+    - mongodb:database
+  - - lcm:vca
+    - vca:vca
+  - - ro:ro
+    - lcm:ro
+  - - ro:kafka
+    - kafka:kafka
+  - - ro:mongodb
+    - mongodb:database
+  - - pol:kafka
+    - kafka:kafka
+  - - pol:mongodb
+    - mongodb:database
+  - - mon:mongodb
+    - mongodb:database
+  - - mon:kafka
+    - kafka:kafka
+  - - mon:vca
+    - vca:vca
+  - - nbi:mongodb
+    - mongodb:database
+  - - nbi:kafka
+    - kafka:kafka
+  - - nbi:ingress
+    - ingress:ingress
+  - - nbi:prometheus
+    - prometheus:prometheus
+  - - nbi:keystone
+    - keystone:keystone
+  - - mon:prometheus
+    - prometheus:prometheus
+  - - ng-ui:nbi
+    - nbi:nbi
+  - - ng-ui:ingress
+    - ingress:ingress
+  - - mon:keystone
+    - keystone:keystone
+  - - mariadb:mysql
+    - pol:mysql
+  - - grafana:db
+    - mariadb:mysql