projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "change charm installation for the New generation RO"
[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
f395830
..
f60082e
100644
(file)
--- a/
installers/charm/bundles/osm-ha/bundle.yaml
+++ b/
installers/charm/bundles/osm-ha/bundle.yaml
@@
-82,7
+82,7
@@
applications:
gui-x: 0
gui-y: 50
nbi-k8s:
gui-x: 0
gui-y: 50
nbi-k8s:
- charm: "
cs:~charmed-osm/nbi-k8
s"
+ charm: "
%(prefix)s/nbi-k8s%(suffix)
s"
channel: "%(channel)s"
scale: 3
series: kubernetes
channel: "%(channel)s"
scale: 3
series: kubernetes
@@
-91,11
+91,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-k8
s"
+ charm: "
%(prefix)s/ro-k8s%(suffix)
s"
channel: "%(channel)s"
scale: 3
series: kubernetes
channel: "%(channel)s"
scale: 3
series: kubernetes
@@
-109,7
+110,7
@@
applications:
gui-x: -250
gui-y: 300
ui-k8s:
gui-x: -250
gui-y: 300
ui-k8s:
- charm: "
cs:~charmed-osm/ui-k8
s"
+ charm: "
%(prefix)s/ui-k8s%(suffix)
s"
channel: "%(channel)s"
scale: 3
series: kubernetes
channel: "%(channel)s"
scale: 3
series: kubernetes
@@
-118,8
+119,21
@@
applications:
annotations:
gui-x: 250
gui-y: -200
annotations:
gui-x: 250
gui-y: -200
+ ng-ui:
+ charm: "%(prefix)s/ng-ui%(suffix)s"
+ channel: "%(channel)s"
+ scale: 3
+ 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:
lcm-k8s:
- charm: "
cs:~charmed-osm/lcm-k8
s"
+ charm: "
%(prefix)s/lcm-k8s%(suffix)
s"
channel: "%(channel)s"
scale: 3
series: kubernetes
channel: "%(channel)s"
scale: 3
series: kubernetes
@@
-132,14
+146,13
@@
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-k8
s"
+ charm: "
%(prefix)s/mon-k8s%(suffix)
s"
channel: "%(channel)s"
scale: 3
series: kubernetes
channel: "%(channel)s"
scale: 3
series: kubernetes
@@
-161,7
+174,7
@@
applications:
gui-x: 250
gui-y: 50
pol-k8s:
gui-x: 250
gui-y: 50
pol-k8s:
- charm: "
cs:~charmed-osm/pol-k8
s"
+ charm: "
%(prefix)s/pol-k8s%(suffix)
s"
channel: "%(channel)s"
scale: 3
series: kubernetes
channel: "%(channel)s"
scale: 3
series: kubernetes
@@
-172,7
+185,7
@@
applications:
annotations:
gui-x: -250
gui-y: 550
annotations:
gui-x: -250
gui-y: 550
- pla
-k8s
:
+ pla:
charm: "%(prefix)s/pla%(suffix)s"
channel: "%(channel)s"
scale: 3
charm: "%(prefix)s/pla%(suffix)s"
channel: "%(channel)s"
scale: 3
@@
-202,6
+215,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"
@@
-240,5
+261,9
@@
relations:
- "kafka-k8s:kafka"
- - "pla:mongo"
- "mongodb-k8s:mongo"
- "kafka-k8s:kafka"
- - "pla:mongo"
- "mongodb-k8s:mongo"
- - - "pla:mysql"
- - "mariadb-k8s:mysql"
+ - - 'ng-ui:nbi'
+ - 'nbi-k8s:nbi'
+ - - 'keystone:db'
+ - 'mariadb-k8s:mysql'
+ - - 'keystone:keystone'
+ - 'nbi-k8s:keystone'