projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bugs and pin osm bundles
[osm/devops.git]
/
installers
/
charm
/
bundles
/
osm-ha
/
bundle.yaml
diff --git
a/installers/charm/bundles/osm-ha/bundle.yaml
b/installers/charm/bundles/osm-ha/bundle.yaml
index
212a520
..
ff666c0
100644
(file)
--- a/
installers/charm/bundles/osm-ha/bundle.yaml
+++ b/
installers/charm/bundles/osm-ha/bundle.yaml
@@
-28,7
+28,7
@@
applications:
zookeeper-units: 3
annotations:
gui-x: 0
zookeeper-units: 3
annotations:
gui-x: 0
- gui-y:
110
0
+ gui-y:
55
0
mariadb-k8s:
charm: "cs:~charmed-osm/mariadb-k8s"
channel: "stable"
mariadb-k8s:
charm: "cs:~charmed-osm/mariadb-k8s"
channel: "stable"
@@
-46,8
+46,8
@@
applications:
query-cache-size: 0
ha-mode: true
annotations:
query-cache-size: 0
ha-mode: true
annotations:
- gui-x: -
50
0
- gui-y: -
4
00
+ gui-x: -
25
0
+ gui-y: -
2
00
kafka-k8s:
charm: "cs:~charmed-osm/kafka-k8s"
channel: "stable"
kafka-k8s:
charm: "cs:~charmed-osm/kafka-k8s"
channel: "stable"
@@
-63,7
+63,7
@@
applications:
zookeeper-service-name: zookeeper-k8s-endpoints
annotations:
gui-x: 0
zookeeper-service-name: zookeeper-k8s-endpoints
annotations:
gui-x: 0
- gui-y:
6
00
+ gui-y:
3
00
mongodb-k8s:
charm: "cs:~charmed-osm/mongodb-k8s"
channel: "stable"
mongodb-k8s:
charm: "cs:~charmed-osm/mongodb-k8s"
channel: "stable"
@@
-80,10
+80,9
@@
applications:
enable-sidecar: true
annotations:
gui-x: 0
enable-sidecar: true
annotations:
gui-x: 0
- gui-y:
10
0
+ gui-y:
5
0
nbi-k8s:
nbi-k8s:
- charm: "cs:~charmed-osm/nbi-k8s"
- channel: "%(channel)s"
+ charm: "%(prefix)s/nbi-k8s%(suffix)s"
scale: 3
series: kubernetes
storage:
scale: 3
series: kubernetes
storage:
@@
-91,12
+90,12
@@
applications:
options:
log_level: "INFO"
DATABASE_COMMONKEY: osm
options:
log_level: "INFO"
DATABASE_COMMONKEY: osm
+ auth-backend: keystone
annotations:
gui-x: 0
annotations:
gui-x: 0
- gui-y: -
4
00
+ gui-y: -
2
00
ro-k8s:
ro-k8s:
- charm: "cs:~charmed-osm/ro-k8s"
- channel: "%(channel)s"
+ charm: "%(prefix)s/ro-k8s%(suffix)s"
scale: 3
series: kubernetes
storage:
scale: 3
series: kubernetes
storage:
@@
-106,21
+105,22
@@
applications:
ro_database: "mano_db"
OPENMANO_TENANT: "osm"
annotations:
ro_database: "mano_db"
OPENMANO_TENANT: "osm"
annotations:
- gui-x: -500
- gui-y: 600
- ui-k8s:
- charm: "cs:~charmed-osm/ui-k8s"
- channel: "%(channel)s"
+ gui-x: -250
+ gui-y: 300
+ ng-ui:
+ charm: "%(prefix)s/ng-ui%(suffix)s"
scale: 3
series: kubernetes
options:
scale: 3
series: kubernetes
options:
- mysql_database: lwui
+ port: 80
+ https_port: 443
+ server_name: localhost
+ client_max_body_size: 15M
annotations:
gui-x: 500
annotations:
gui-x: 500
- gui-y:
-4
00
+ gui-y:
1
00
lcm-k8s:
lcm-k8s:
- charm: "cs:~charmed-osm/lcm-k8s"
- channel: "%(channel)s"
+ charm: "%(prefix)s/lcm-k8s%(suffix)s"
scale: 3
series: kubernetes
storage:
scale: 3
series: kubernetes
storage:
@@
-132,16
+132,14
@@
applications:
vca_password: secret
vca_pubkey: pubkey
vca_cacert: cacert
vca_password: secret
vca_pubkey: pubkey
vca_cacert: cacert
- vca_apiproxy: apiproxy
use_external_vca: true
DATABASE_COMMONKEY: osm
annotations:
use_external_vca: true
DATABASE_COMMONKEY: osm
annotations:
- gui-x: -
50
0
- gui-y:
10
0
+ gui-x: -
25
0
+ gui-y:
5
0
mon-k8s:
mon-k8s:
- charm: "cs:~charmed-osm/mon-k8s"
- channel: "%(channel)s"
- scale: 3
+ charm: "%(prefix)s/mon-k8s%(suffix)s"
+ scale: 1
series: kubernetes
storage:
database: 100M
series: kubernetes
storage:
database: 100M
@@
-158,11
+156,10
@@
applications:
vca_cacert: cacert
use_external_vca: true
annotations:
vca_cacert: cacert
use_external_vca: true
annotations:
- gui-x:
50
0
- gui-y:
10
0
+ gui-x:
25
0
+ gui-y:
5
0
pol-k8s:
pol-k8s:
- charm: "cs:~charmed-osm/pol-k8s"
- channel: "%(channel)s"
+ charm: "%(prefix)s/pol-k8s%(suffix)s"
scale: 3
series: kubernetes
storage:
scale: 3
series: kubernetes
storage:
@@
-170,12
+167,19
@@
applications:
options:
log_level: INFO
annotations:
options:
log_level: INFO
annotations:
- gui-x: -500
- gui-y: 1100
+ gui-x: -250
+ gui-y: 550
+ pla:
+ charm: "%(prefix)s/pla%(suffix)s"
+ scale: 3
+ series: kubernetes
+ annotations:
+ gui-x: 500
+ gui-y: -200
prometheus-k8s:
charm: "cs:~charmed-osm/prometheus-k8s"
channel: "stable"
prometheus-k8s:
charm: "cs:~charmed-osm/prometheus-k8s"
channel: "stable"
- scale:
3
+ scale:
1
series: kubernetes
storage:
database: 100M
series: kubernetes
storage:
database: 100M
@@
-184,16
+188,24
@@
applications:
web-subpath: /
default-target: "mon-k8s:8000"
annotations:
web-subpath: /
default-target: "mon-k8s:8000"
annotations:
- gui-x:
50
0
- gui-y:
6
00
+ gui-x:
25
0
+ gui-y:
3
00
grafana-k8s:
charm: "cs:~charmed-osm/grafana-k8s"
channel: "stable"
scale: 3
series: kubernetes
annotations:
grafana-k8s:
charm: "cs:~charmed-osm/grafana-k8s"
channel: "stable"
scale: 3
series: kubernetes
annotations:
- gui-x: 500
- gui-y: 1100
+ gui-x: 250
+ gui-y: 550
+ keystone:
+ charm: '%(prefix)s/keystone%(suffix)s'
+ channel: '%(channel)s'
+ scale: 1
+ series: kubernetes
+ annotations:
+ gui-x: -250
+ gui-y: 550
relations:
- - "kafka-k8s:zookeeper"
relations:
- - "kafka-k8s:zookeeper"
@@
-222,9
+234,19
@@
relations:
- "mon-k8s:prometheus"
- - "grafana-k8s:prometheus"
- "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"
- - "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"