projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release 13 Preparation
[osm/devops.git]
/
installers
/
charm
/
bundles
/
osm
/
bundle.yaml
diff --git
a/installers/charm/bundles/osm/bundle.yaml
b/installers/charm/bundles/osm/bundle.yaml
index
fa367dc
..
c0e5b58
100644
(file)
--- a/
installers/charm/bundles/osm/bundle.yaml
+++ b/
installers/charm/bundles/osm/bundle.yaml
@@
-29,15
+29,18
@@
description: |
- Availability of managed services
applications:
zookeeper:
- Availability of managed services
applications:
zookeeper:
- charm:
osm-zookeeper
- channel: latest/
edg
e
+ charm:
zookeeper-k8s
+ channel: latest/
stabl
e
scale: 1
scale: 1
- series: kubernetes
storage:
storage:
- database: 100M
- annotations:
- gui-x: 0
- gui-y: 500
+ data: 100M
+ kafka:
+ charm: kafka-k8s
+ channel: latest/stable
+ scale: 1
+ trust: true
+ storage:
+ data: 100M
mariadb:
charm: charmed-osm-mariadb-k8s
scale: 1
mariadb:
charm: charmed-osm-mariadb-k8s
scale: 1
@@
-48,19
+51,6
@@
applications:
password: manopw
root_password: osm4u
user: mano
password: manopw
root_password: osm4u
user: mano
- annotations:
- gui-x: -300
- gui-y: -250
- kafka:
- charm: osm-kafka
- channel: latest/edge
- scale: 1
- series: kubernetes
- storage:
- database: 100M
- annotations:
- gui-x: 0
- gui-y: 250
mongodb:
charm: mongodb-k8s
channel: latest/stable
mongodb:
charm: mongodb-k8s
channel: latest/stable
@@
-68,109
+58,88
@@
applications:
series: kubernetes
storage:
db: 50M
series: kubernetes
storage:
db: 50M
- annotations:
- gui-x: 0
- gui-y: 0
nbi:
charm: osm-nbi
nbi:
charm: osm-nbi
- channel: latest/edge
+ channel: v13.0/stable
+ trust: true
scale: 1
scale: 1
- series: kubernetes
options:
options:
- database_commonkey: osm
- auth_backend: keystone
- log_level: DEBUG
- annotations:
- gui-x: 0
- gui-y: -250
+ database-commonkey: osm
+ log-level: DEBUG
+ resources:
+ nbi-image: opensourcemano/nbi:testing-daily
ro:
charm: osm-ro
ro:
charm: osm-ro
- channel: latest/edge
+ channel: v13.0/stable
+ trust: true
scale: 1
scale: 1
- series: kubernetes
options:
options:
- log_level: DEBUG
- annotations:
- gui-x: -300
- gui-y: 250
+ log-level: DEBUG
+ resources:
+ ro-image: opensourcemano/ro:testing-daily
ng-ui:
charm: osm-ng-ui
ng-ui:
charm: osm-ng-ui
- channel: latest/edge
+ channel: v13.0/stable
+ trust: true
scale: 1
scale: 1
- series: kubernetes
- annotations:
- gui-x: 600
- gui-y: 0
+ resources:
+ ng-ui-image: opensourcemano/ng-ui:testing-daily
lcm:
charm: osm-lcm
lcm:
charm: osm-lcm
- channel:
latest/edg
e
+ channel:
v13.0/stabl
e
scale: 1
scale: 1
- series: kubernetes
options:
options:
- database_commonkey: osm
- log_level: DEBUG
- annotations:
- gui-x: -300
- gui-y: 0
+ database-commonkey: osm
+ log-level: DEBUG
+ resources:
+ lcm-image: opensourcemano/lcm:testing-daily
mon:
charm: osm-mon
mon:
charm: osm-mon
- channel: latest/edge
+ channel: v13.0/stable
+ trust: true
scale: 1
scale: 1
- series: kubernetes
options:
options:
- database_commonkey: osm
- log_level: DEBUG
- keystone_enabled: true
- annotations:
- gui-x: 300
- gui-y: 0
+ database-commonkey: osm
+ log-level: DEBUG
+ keystone-enabled: true
+ resources:
+ mon-image: opensourcemano/mon:testing-daily
pol:
charm: osm-pol
pol:
charm: osm-pol
- channel:
latest/edg
e
+ channel:
v13.0/stabl
e
scale: 1
scale: 1
- series: kubernetes
options:
options:
- log_level: DEBUG
- annotations:
- gui-x: -300
- gui-y: 500
- pla:
- charm: osm-pla
- channel: latest/edge
+ log-level: DEBUG
+ resources:
+ pol-image: opensourcemano/pol:testing-daily
+ vca:
+ charm: osm-vca-integrator
+ channel: v13.0/stable
+ scale: 1
+ ingress:
+ charm: nginx-ingress-integrator
+ channel: latest/stable
scale: 1
scale: 1
- series: kubernetes
- options:
- log_level: DEBUG
- annotations:
- gui-x: 600
- gui-y: -250
prometheus:
charm: osm-prometheus
prometheus:
charm: osm-prometheus
- channel: latest/
edg
e
+ channel: latest/
stabl
e
scale: 1
series: kubernetes
storage:
data: 50M
options:
default-target: "mon:8000"
scale: 1
series: kubernetes
storage:
data: 50M
options:
default-target: "mon:8000"
- annotations:
- gui-x: 300
- gui-y: 250
grafana:
charm: osm-grafana
grafana:
charm: osm-grafana
- channel: latest/
edg
e
+ channel: latest/
stabl
e
scale: 1
series: kubernetes
scale: 1
series: kubernetes
- annotations:
- gui-x: 300
- gui-y: 500
keystone:
charm: osm-keystone
keystone:
charm: osm-keystone
- channel: latest/
edg
e
+ channel: latest/
stabl
e
scale: 1
scale: 1
- annotations:
- gui-x: 300
- gui-y: -250
+ resources:
+ keystone-image: opensourcemano/keystone:testing-daily
relations:
- - grafana:prometheus
- prometheus:prometheus
relations:
- - grafana:prometheus
- prometheus:prometheus
@@
-182,6
+151,8
@@
relations:
- kafka:kafka
- - lcm:mongodb
- mongodb:database
- kafka:kafka
- - lcm:mongodb
- mongodb:database
+ - - lcm:vca
+ - vca:vca
- - ro:ro
- lcm:ro
- - ro:kafka
- - ro:ro
- lcm:ro
- - ro:kafka
@@
-196,14
+167,14
@@
relations:
- mongodb:database
- - mon:kafka
- kafka:kafka
- mongodb:database
- - mon:kafka
- kafka:kafka
- - - pla:kafka
- - kafka:kafka
- - - pla:mongodb
- - mongodb:database
+ - - mon:vca
+ - vca:vca
- - nbi:mongodb
- mongodb:database
- - nbi:kafka
- kafka:kafka
- - nbi:mongodb
- mongodb:database
- - nbi:kafka
- kafka:kafka
+ - - nbi:ingress
+ - ingress:ingress
- - nbi:prometheus
- prometheus:prometheus
- - nbi:keystone
- - nbi:prometheus
- prometheus:prometheus
- - nbi:keystone
@@
-212,6
+183,8
@@
relations:
- prometheus:prometheus
- - ng-ui:nbi
- nbi:nbi
- prometheus:prometheus
- - ng-ui:nbi
- nbi:nbi
+ - - ng-ui:ingress
+ - ingress:ingress
- - mon:keystone
- keystone:keystone
- - mariadb:mysql
- - mon:keystone
- keystone:keystone
- - mariadb:mysql