X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Fcharm%2Fbundles%2Fosm-ha%2Fbundle.yaml;h=80695431435a1f5bc0ac6021d4e07af3a71fa13c;hb=49379ced23b5e344a773ce77ac9cb59c1864e19b;hp=f395830ebf984f3e81a884edbace205f997b9c3d;hpb=5863d3e8d8dca5108d89b993d5eb019ab16df587;p=osm%2Fdevops.git diff --git a/installers/charm/bundles/osm-ha/bundle.yaml b/installers/charm/bundles/osm-ha/bundle.yaml index f395830e..80695431 100644 --- a/installers/charm/bundles/osm-ha/bundle.yaml +++ b/installers/charm/bundles/osm-ha/bundle.yaml @@ -22,9 +22,6 @@ applications: storage: database: 100M options: - # client-port: 2181 - server-port: 2888 - leader-election-port: 3888 zookeeper-units: 3 annotations: gui-x: 0 @@ -40,10 +37,6 @@ 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 @@ -54,13 +47,10 @@ applications: scale: 3 series: kubernetes storage: - database: 200M + database: 100M options: - advertised-hostname: "kafka-k8s" - advertised-port: 9092 - kafka-units: 3 zookeeper-units: 3 - zookeeper-service-name: zookeeper-k8s-endpoints + kafka-units: 3 annotations: gui-x: 0 gui-y: 300 @@ -70,175 +60,142 @@ applications: scale: 3 series: kubernetes storage: - database: 300M + database: 50M 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: "cs:~charmed-osm/nbi-k8s" - channel: "%(channel)s" + nbi: + charm: "cs:~charmed-osm/nbi-5" scale: 3 series: kubernetes - storage: - packages: 100M 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: "cs:~charmed-osm/ro-k8s" - channel: "%(channel)s" + ro: + charm: "cs:~charmed-osm/ro-0" scale: 3 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: "cs:~charmed-osm/ui-k8s" - channel: "%(channel)s" + ng-ui: + charm: "cs:~charmed-osm/ng-ui-16" scale: 3 series: kubernetes - options: - mysql_database: lwui annotations: - gui-x: 250 - gui-y: -200 - lcm-k8s: - charm: "cs:~charmed-osm/lcm-k8s" - channel: "%(channel)s" + gui-x: 500 + gui-y: 100 + lcm: + charm: "cs:~charmed-osm/lcm-0" 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 - vca_apiproxy: apiproxy - use_external_vca: true - DATABASE_COMMONKEY: osm + database_commonkey: osm + log_level: DEBUG annotations: gui-x: -250 gui-y: 50 - mon-k8s: - charm: "cs:~charmed-osm/mon-k8s" - channel: "%(channel)s" - scale: 3 + mon: + charm: "cs:~charmed-osm/mon-0" + 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: true + database_commonkey: osm + log_level: DEBUG annotations: gui-x: 250 gui-y: 50 - pol-k8s: - charm: "cs:~charmed-osm/pol-k8s" - channel: "%(channel)s" + pol: + charm: "cs:~charmed-osm/pol-0" scale: 3 series: kubernetes - storage: - database: 100M options: - log_level: INFO + log_level: DEBUG annotations: gui-x: -250 gui-y: 550 - pla-k8s: - charm: "%(prefix)s/pla%(suffix)s" - channel: "%(channel)s" + pla: + charm: "cs:~charmed-osm/pla-6" scale: 3 series: kubernetes + options: + log_level: DEBUG annotations: gui-x: 500 gui-y: -200 - prometheus-k8s: - charm: "cs:~charmed-osm/prometheus-k8s" - channel: "stable" - scale: 3 + prometheus: + charm: "cs:~charmed-osm/prometheus-0" + scale: 1 series: kubernetes storage: - database: 100M + 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" + grafana: + charm: "cs:~charmed-osm/grafana-0" scale: 3 series: kubernetes annotations: gui-x: 250 gui-y: 550 - + keystone: + charm: "cs:~charmed-osm/keystone-4" + scale: 1 + series: kubernetes + annotations: + gui-x: -250 + gui-y: 550 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-k8s:mongo + - - ro:ro + - lcm:ro + - - ro:kafka + - kafka-k8s:kafka + - - ro:mongodb + - mongodb-k8s:mongo + - - pol:kafka + - kafka-k8s:kafka + - - pol:mongodb + - mongodb-k8s:mongo + - - mon:mongodb + - mongodb-k8s:mongo + - - mon:kafka + - kafka-k8s:kafka + - - pla:kafka + - kafka-k8s:kafka + - - pla:mongodb + - mongodb-k8s:mongo + - - nbi:mongodb + - mongodb-k8s:mongo + - - nbi:kafka + - kafka-k8s:kafka + - - nbi:prometheus + - prometheus:prometheus + - - nbi:keystone + - keystone:keystone + - - mon:prometheus + - prometheus:prometheus + - - ng-ui:nbi + - nbi:nbi