X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fdevops.git;a=blobdiff_plain;f=installers%2Fcharm%2Fbundles%2Fosm%2Fbundle.yaml;h=58a97073e7325f7d7874273ffaa6f9c919077893;hp=f1a846cba53a5851109934bed22e829507ff0729;hb=49379ced23b5e344a773ce77ac9cb59c1864e19b;hpb=e5fd208248a496cd798a66cb27216e83f2852a76 diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml index f1a846cb..58a97073 100644 --- a/installers/charm/bundles/osm/bundle.yaml +++ b/installers/charm/bundles/osm/bundle.yaml @@ -21,11 +21,6 @@ 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 @@ -40,11 +35,6 @@ 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 @@ -55,12 +45,6 @@ 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 @@ -72,180 +56,140 @@ applications: storage: database: 50M options: - advertised-port: 27017 replica-set: rs0 namespace: osm - service-name: mongodb-k8s-endpoints - cluster-domain: cluster.local - enable-sidecar: false + enable-sidecar: true annotations: gui-x: 0 gui-y: 50 - nbi-k8s: - charm: "%(prefix)s/nbi-k8s%(suffix)s" + nbi: + charm: "cs:~charmed-osm/nbi-5" scale: 1 series: kubernetes - storage: - packages: 50M options: - log_level: "INFO" - DATABASE_COMMONKEY: osm - auth-backend: keystone + 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" + ro: + charm: "cs:~charmed-osm/ro-0" 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 ng-ui: - charm: "%(prefix)s/ng-ui%(suffix)s" + charm: "cs:~charmed-osm/ng-ui-16" scale: 1 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" + lcm: + charm: "cs:~charmed-osm/lcm-0" 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 - 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" + 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: false + database_commonkey: osm + log_level: DEBUG annotations: gui-x: 250 gui-y: 50 - pol-k8s: - charm: "%(prefix)s/pol-k8s%(suffix)s" + pol: + charm: "cs:~charmed-osm/pol-0" scale: 1 series: kubernetes - storage: - database: 100M options: - log_level: INFO + log_level: DEBUG annotations: gui-x: -250 gui-y: 550 pla: - charm: "%(prefix)s/pla%(suffix)s" + charm: "cs:~charmed-osm/pla-6" 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" + prometheus: + charm: "cs:~charmed-osm/prometheus-0" 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" + grafana: + charm: "cs:~charmed-osm/grafana-0" scale: 1 series: kubernetes annotations: gui-x: 250 gui-y: 550 keystone: - charm: '%(prefix)s/keystone%(suffix)s' + 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" - - - "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' - - - "ro-k8s:mongo" - - "mongodb-k8s:mongo" - - - "ro-k8s:kafka" - - "kafka-k8s:kafka" + - - 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