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
c6f0249
..
ff666c0
100644
(file)
--- a/
installers/charm/bundles/osm-ha/bundle.yaml
+++ b/
installers/charm/bundles/osm-ha/bundle.yaml
@@
-82,8
+82,7
@@
applications:
gui-x: 0
gui-y: 50
nbi-k8s:
gui-x: 0
gui-y: 50
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
gui-y: -200
ro-k8s:
annotations:
gui-x: 0
gui-y: -200
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:
@@
-108,20
+107,9
@@
applications:
annotations:
gui-x: -250
gui-y: 300
annotations:
gui-x: -250
gui-y: 300
- ui-k8s:
- charm: "cs:~charmed-osm/ui-k8s"
- channel: "%(channel)s"
- scale: 3
- series: kubernetes
- options:
- mysql_database: lwui
- annotations:
- gui-x: 250
- gui-y: -200
ng-ui:
charm: "%(prefix)s/ng-ui%(suffix)s"
ng-ui:
charm: "%(prefix)s/ng-ui%(suffix)s"
- channel: "%(channel)s"
- scale: 1
+ scale: 3
series: kubernetes
options:
port: 80
series: kubernetes
options:
port: 80
@@
-132,8
+120,7
@@
applications:
gui-x: 500
gui-y: 100
lcm-k8s:
gui-x: 500
gui-y: 100
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:
@@
-145,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:
gui-x: -250
gui-y: 50
mon-k8s:
use_external_vca: true
DATABASE_COMMONKEY: osm
annotations:
gui-x: -250
gui-y: 50
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
@@
-174,8
+159,7
@@
applications:
gui-x: 250
gui-y: 50
pol-k8s:
gui-x: 250
gui-y: 50
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:
@@
-185,9
+169,8
@@
applications:
annotations:
gui-x: -250
gui-y: 550
annotations:
gui-x: -250
gui-y: 550
- pla
-k8s
:
+ pla:
charm: "%(prefix)s/pla%(suffix)s"
charm: "%(prefix)s/pla%(suffix)s"
- channel: "%(channel)s"
scale: 3
series: kubernetes
annotations:
scale: 3
series: kubernetes
annotations:
@@
-196,7
+179,7
@@
applications:
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
@@
-215,6
+198,14
@@
applications:
annotations:
gui-x: 250
gui-y: 550
annotations:
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"
@@
-243,17
+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"
- - "pla:kafka"
- "kafka-k8s:kafka"
- - "pla:mongo"
- "mongodb-k8s:mongo"
- - "prometheus-k8s:prometheus"
- "nbi-k8s:prometheus"
- - "pla:kafka"
- "kafka-k8s:kafka"
- - "pla:mongo"
- "mongodb-k8s:mongo"
- - - "pla:mysql"
- - "mariadb-k8s:mysql"
- - 'ng-ui:nbi'
- 'nbi-k8s:nbi'
- - '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"