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

diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml
index 71465f6c..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:
@@ -21,14 +34,9 @@ applications:
     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: 550
+      gui-y: 500
   mariadb-k8s:
     charm: "cs:~charmed-osm/mariadb-k8s"
     channel: "stable"
@@ -40,14 +48,9 @@ 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: -250
-      gui-y: -200
+      gui-x: -300
+      gui-y: -250
   kafka-k8s:
     charm: "cs:~charmed-osm/kafka-k8s"
     channel: "stable"
@@ -55,199 +58,151 @@ applications:
     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: 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:
-      advertised-port: 27017
-      replica-set: rs0
-      namespace: osm
-      service-name: mongodb-k8s-endpoints
-      cluster-domain: cluster.local
-      enable-sidecar: false
+      db: 50M
     annotations:
       gui-x: 0
-      gui-y: 50
-  nbi-k8s:
-    charm: "%(prefix)s/nbi-k8s%(suffix)s"
-    channel: "%(channel)s"
+      gui-y: 0
+  nbi:
+    charm: "cs:~charmed-osm/nbi-16"
     scale: 1
     series: kubernetes
-    storage:
-      packages: 50M
     options:
-      log_level: "INFO"
-      DATABASE_COMMONKEY: osm
+      database_commonkey: osm
+      auth_backend: keystone
+      log_level: DEBUG
     annotations:
       gui-x: 0
-      gui-y: -200
-  ro-k8s:
-    charm: "%(prefix)s/ro-k8s%(suffix)s"
-    channel: "%(channel)s"
+      gui-y: -250
+  ro:
+    charm: "cs:~charmed-osm/ro-8"
     scale: 1
     series: kubernetes
-    storage:
-      log: 50M
     options:
-      vim_database: "mano_vim_db"
-      ro_database: "mano_db"
-      OPENMANO_TENANT: "osm"
+      log_level: DEBUG
     annotations:
-      gui-x: -250
-      gui-y: 300
-  ui-k8s:
-    charm: "%(prefix)s/ui-k8s%(suffix)s"
-    channel: "%(channel)s"
-    scale: 1
-    series: kubernetes
-    options:
-      mysql_database: lwui
-    annotations:
-      gui-x: 250
-      gui-y: -200
+      gui-x: -300
+      gui-y: 250
   ng-ui:
-    charm: "%(prefix)s/ng-ui%(suffix)s"
-    channel: "%(channel)s"
+    charm: "cs:~charmed-osm/ng-ui-23"
     scale: 1
     series: kubernetes
-    options:
-      port: 80
-      server_name: localhost
-      client_max_body_size: 15M
-  lcm-k8s:
-    charm: "%(prefix)s/lcm-k8s%(suffix)s"
-    channel: "%(channel)s"
+    annotations:
+      gui-x: 600
+      gui-y: 0
+  lcm:
+    charm: "cs:~charmed-osm/lcm-13"
     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
+      database_commonkey: osm
+      log_level: DEBUG
     annotations:
-      gui-x: -250
-      gui-y: 50
-  mon-k8s:
-    charm: "%(prefix)s/mon-k8s%(suffix)s"
-    channel: "%(channel)s"
+      gui-x: -300
+      gui-y: 0
+  mon:
+    charm: "cs:~charmed-osm/mon-9"
     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
+      database_commonkey: osm
+      log_level: DEBUG
+      keystone_enabled: true
     annotations:
-      gui-x: 250
-      gui-y: 50
-  pol-k8s:
-    charm: "%(prefix)s/pol-k8s%(suffix)s"
-    channel: "%(channel)s"
+      gui-x: 300
+      gui-y: 0
+  pol:
+    charm: "cs:~charmed-osm/pol-8"
     scale: 1
     series: kubernetes
-    storage:
-      database: 100M
     options:
-      log_level: INFO
+      log_level: DEBUG
     annotations:
-      gui-x: -250
-      gui-y: 550
+      gui-x: -300
+      gui-y: 500
   pla:
-    charm: "%(prefix)s/pla%(suffix)s"
-    channel: "%(channel)s"
+    charm: "cs:~charmed-osm/pla-11"
     scale: 1
     series: kubernetes
+    options:
+      log_level: DEBUG
     annotations:
-      gui-x: 500
-      gui-y: -200
-  prometheus-k8s:
-    charm: "cs:~charmed-osm/prometheus-k8s"
-    channel: "stable"
+      gui-x: 600
+      gui-y: -250
+  prometheus:
+    charm: "cs:~charmed-osm/prometheus-6"
     scale: 1
     series: kubernetes
     storage:
-      database: 50M
+      data: 50M
     options:
-      advertised-port: 9090
-      web-subpath: /
-      default-target: "mon-k8s:8000"
+      default-target: "mon:8000"
     annotations:
-      gui-x: 250
-      gui-y: 300
-  grafana-k8s:
-    charm: "cs:~charmed-osm/grafana-k8s"
-    channel: "stable"
+      gui-x: 300
+      gui-y: 250
+  grafana:
+    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-12"
+    scale: 1
+    series: kubernetes
+    annotations:
+      gui-x: 300
+      gui-y: -250
 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"
-  - - "pla:mysql"
-    - "mariadb-k8s:mysql"
+  - - grafana:prometheus
+    - prometheus:prometheus
+  - - kafka-k8s:zookeeper
+    - zookeeper-k8s:zookeeper
+  - - keystone:db
+    - mariadb-k8s:mysql
+  - - lcm:kafka
+    - kafka-k8s:kafka
+  - - lcm:mongodb
+    - mongodb:database
+  - - ro:ro
+    - lcm:ro
+  - - ro:kafka
+    - kafka-k8s:kafka
+  - - ro:mongodb
+    - mongodb:database
+  - - pol:kafka
+    - kafka-k8s:kafka
+  - - pol:mongodb
+    - mongodb:database
+  - - mon:mongodb
+    - mongodb:database
+  - - mon:kafka
+    - kafka-k8s:kafka
+  - - pla:kafka
+    - kafka-k8s:kafka
+  - - pla:mongodb
+    - mongodb:database
+  - - nbi:mongodb
+    - mongodb:database
+  - - nbi:kafka
+    - kafka-k8s:kafka
+  - - nbi:prometheus
+    - prometheus:prometheus
+  - - nbi:keystone
+    - keystone:keystone
+  - - mon:prometheus
+    - prometheus:prometheus
+  - - ng-ui:nbi
+    - nbi:nbi
+  - - mon:keystone
+    - keystone:keystone
+  - - mariadb-k8s:mysql
+    - pol:mysql