projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update RO charm for the newRO and update bundle
[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
c4567ac
..
f1a846c
100644
(file)
--- a/
installers/charm/bundles/osm/bundle.yaml
+++ b/
installers/charm/bundles/osm/bundle.yaml
@@
-83,7
+83,6
@@
applications:
gui-y: 50
nbi-k8s:
charm: "%(prefix)s/nbi-k8s%(suffix)s"
gui-y: 50
nbi-k8s:
charm: "%(prefix)s/nbi-k8s%(suffix)s"
- channel: "%(channel)s"
scale: 1
series: kubernetes
storage:
scale: 1
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:
charm: "%(prefix)s/ro-k8s%(suffix)s"
annotations:
gui-x: 0
gui-y: -200
ro-k8s:
charm: "%(prefix)s/ro-k8s%(suffix)s"
- channel: "%(channel)s"
scale: 1
series: kubernetes
storage:
scale: 1
series: kubernetes
storage:
@@
-108,19
+107,8
@@
applications:
annotations:
gui-x: -250
gui-y: 300
annotations:
gui-x: -250
gui-y: 300
- ui-k8s:
- charm: "%(prefix)s/ui-k8s%(suffix)s"
- channel: "%(channel)s"
- scale: 1
- 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
series: kubernetes
options:
scale: 1
series: kubernetes
options:
@@
-133,7
+121,6
@@
applications:
gui-y: 100
lcm-k8s:
charm: "%(prefix)s/lcm-k8s%(suffix)s"
gui-y: 100
lcm-k8s:
charm: "%(prefix)s/lcm-k8s%(suffix)s"
- channel: "%(channel)s"
scale: 1
series: kubernetes
storage:
scale: 1
series: kubernetes
storage:
@@
-152,7
+139,6
@@
applications:
gui-y: 50
mon-k8s:
charm: "%(prefix)s/mon-k8s%(suffix)s"
gui-y: 50
mon-k8s:
charm: "%(prefix)s/mon-k8s%(suffix)s"
- channel: "%(channel)s"
scale: 1
series: kubernetes
storage:
scale: 1
series: kubernetes
storage:
@@
-174,7
+160,6
@@
applications:
gui-y: 50
pol-k8s:
charm: "%(prefix)s/pol-k8s%(suffix)s"
gui-y: 50
pol-k8s:
charm: "%(prefix)s/pol-k8s%(suffix)s"
- channel: "%(channel)s"
scale: 1
series: kubernetes
storage:
scale: 1
series: kubernetes
storage:
@@
-186,7
+171,6
@@
applications:
gui-y: 550
pla:
charm: "%(prefix)s/pla%(suffix)s"
gui-y: 550
pla:
charm: "%(prefix)s/pla%(suffix)s"
- channel: "%(channel)s"
scale: 1
series: kubernetes
annotations:
scale: 1
series: kubernetes
annotations:
@@
-214,6
+198,13
@@
applications:
annotations:
gui-x: 250
gui-y: 550
annotations:
gui-x: 250
gui-y: 550
+ keystone:
+ charm: '%(prefix)s/keystone%(suffix)s'
+ scale: 1
+ series: kubernetes
+ annotations:
+ gui-x: -250
+ gui-y: 550
relations:
- - "kafka-k8s:zookeeper"
relations:
- - "kafka-k8s:zookeeper"
@@
-242,10
+233,6
@@
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"
- - "prometheus-k8s:prometheus"
- "nbi-k8s:prometheus"
- - "pla:kafka"
@@
-254,3
+241,11
@@
relations:
- "mongodb-k8s:mongo"
- - 'ng-ui:nbi'
- 'nbi-k8s:nbi'
- "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"