X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fbundles%2Fosm%2Fbundle.yaml;h=c0e5b58764caf053c02a00ae53d51f6d634c299b;hb=0e79802ac825b95b375fc75f0e5be998e977f5b0;hp=fc3dbcb4d632de4a56894586a561b743ffcd5d9f;hpb=47cd3b277310d5d6fef0067f220e849bebff35b4;p=osm%2Fdevops.git

diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml
index fc3dbcb4..c0e5b587 100644
--- a/installers/charm/bundles/osm/bundle.yaml
+++ b/installers/charm/bundles/osm/bundle.yaml
@@ -11,27 +11,38 @@
 #     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
+name: osm
 bundle: kubernetes
+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
 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
-    options:
-      # client-port: 2181
-      server-port: 2888
-      leader-election-port: 3888
-      zookeeper-units: 1
-    annotations:
-      gui-x: 0
-      gui-y: 1100
-  mariadb-k8s:
-    charm: 'cs:~charmed-osm/mariadb-k8s'
-    channel: 'stable'
+      data: 100M
+  kafka:
+    charm: kafka-k8s
+    channel: latest/stable
+    scale: 1
+    trust: true
+    storage:
+      data: 100M
+  mariadb:
+    charm: charmed-osm-mariadb-k8s
     scale: 1
     series: kubernetes
     storage:
@@ -40,191 +51,143 @@ applications:
       password: manopw
       root_password: osm4u
       user: mano
-      database: database
-      mysql_port: "3306"
-      query-cache-type: "OFF"
-      query-cache-size: 0
-      ha-mode: false
-    annotations:
-      gui-x: -500
-      gui-y: -400
-  kafka-k8s:
-    charm: 'cs:~charmed-osm/kafka-k8s'
-    channel: 'stable'
+  mongodb:
+    charm: mongodb-k8s
+    channel: latest/stable
     scale: 1
     series: kubernetes
     storage:
-      database: 100M
-    options:
-      advertised-hostname: "kafka-k8s"
-      advertised-port: 9092
-      kafka-units: 1
-      zookeeper-units: 1
-      zookeeper-service-name: zookeeper-k8s-endpoints
-    annotations:
-      gui-x: 0
-      gui-y: 600
-  mongodb-k8s:
-    charm: 'cs:~charmed-osm/mongodb-k8s'
-    channel: 'stable'
+      db: 50M
+  nbi:
+    charm: osm-nbi
+    channel: v13.0/stable
+    trust: true
     scale: 1
-    series: kubernetes
-    storage:
-      database: 50M
     options:
-      advertised-port: 27017
-      replica-set: rs0
-      namespace: osm
-      service-name: mongodb-k8s-endpoints
-      cluster-domain: cluster.local
-      enable-sidecar: false
-    annotations:
-      gui-x: 0
-      gui-y: 100
-  nbi-k8s:
-    charm: '%(prefix)s/nbi-k8s%(suffix)s'
-    channel: '%(channel)s'
+      database-commonkey: osm
+      log-level: DEBUG
+    resources:
+      nbi-image: opensourcemano/nbi:testing-daily
+  ro:
+    charm: osm-ro
+    channel: v13.0/stable
+    trust: true
     scale: 1
-    series: kubernetes
-    storage:
-      packages: 50M
     options:
-      log_level: "INFO"
-      DATABASE_COMMONKEY: osm
-    annotations:
-      gui-x: 0
-      gui-y: -400
-  ro-k8s:
-    charm: '%(prefix)s/ro-k8s%(suffix)s'
-    channel: '%(channel)s'
+      log-level: DEBUG
+    resources:
+      ro-image: opensourcemano/ro:testing-daily
+  ng-ui:
+    charm: osm-ng-ui
+    channel: v13.0/stable
+    trust: true
     scale: 1
-    series: kubernetes
-    storage:
-      log: 50M
-    options:
-      vim_database: 'mano_vim_db'
-      ro_database: 'mano_db'
-      OPENMANO_TENANT: 'osm'
-    annotations:
-      gui-x: -500
-      gui-y: 600
-  ui-k8s:
-    charm: '%(prefix)s/ui-k8s%(suffix)s'
-    channel: '%(channel)s'
+    resources:
+      ng-ui-image: opensourcemano/ng-ui:testing-daily
+  lcm:
+    charm: osm-lcm
+    channel: v13.0/stable
     scale: 1
-    series: kubernetes
     options:
-      mysql_database: lwui
-    annotations:
-      gui-x: 500
-      gui-y: -400
-  lcm-k8s:
-    charm: '%(prefix)s/lcm-k8s%(suffix)s'
-    channel: '%(channel)s'
+      database-commonkey: osm
+      log-level: DEBUG
+    resources:
+      lcm-image: opensourcemano/lcm:testing-daily
+  mon:
+    charm: osm-mon
+    channel: v13.0/stable
+    trust: true
     scale: 1
-    series: kubernetes
-    storage:
-      packages: 50M
     options:
-      vca_host: vca
-      vca_port: 17070
-      vca_user: admin
-      vca_password: secret
-      vca_pubkey: pubkey
-      vca_cacert: cacert
-      vca_apiproxy: apiproxy
-      use_external_vca: false
-      DATABASE_COMMONKEY: osm
-    annotations:
-      gui-x: -500
-      gui-y: 100
-  mon-k8s:
-    charm: '%(prefix)s/mon-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: v13.0/stable
     scale: 1
-    series: kubernetes
-    storage:
-      database: 100M
     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: false
-    annotations:
-      gui-x: 500
-      gui-y: 100
-  pol-k8s:
-    charm: '%(prefix)s/pol-k8s%(suffix)s'
-    channel: '%(channel)s'
+      log-level: DEBUG
+    resources:
+      pol-image: opensourcemano/pol:testing-daily
+  vca:
+    charm: osm-vca-integrator
+    channel: v13.0/stable
     scale: 1
-    series: kubernetes
-    storage:
-      database: 100M
-    options:
-      log_level: INFO
-    annotations:
-      gui-x: -500
-      gui-y: 1100
-  prometheus-k8s:
-    charm: 'cs:~charmed-osm/prometheus-k8s'
-    channel: 'stable'
+  ingress:
+    charm: nginx-ingress-integrator
+    channel: latest/stable
+    scale: 1
+  prometheus:
+    charm: osm-prometheus
+    channel: latest/stable
     scale: 1
     series: kubernetes
     storage:
-      database: 50M
+      data: 50M
     options:
-      advertised-port: 9090
-      web-subpath: /
-      default-target: "mon-k8s:8000"
-    annotations:
-      gui-x: 500
-      gui-y: 600
-  grafana-k8s:
-    charm: 'cs:~charmed-osm/grafana-k8s'
-    channel: 'stable'
+      default-target: "mon:8000"
+  grafana:
+    charm: osm-grafana
+    channel: latest/stable
     scale: 1
     series: kubernetes
-    annotations:
-      gui-x: 500
-      gui-y: 1100
-
+  keystone:
+    charm: osm-keystone
+    channel: latest/stable
+    scale: 1
+    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'
+  - - 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