projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Charmed OSM preparation for 10.1.0
[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
9d3f312
..
9d28fe5
100644
(file)
--- a/
installers/charm/bundles/osm-ha/bundle.yaml
+++ b/
installers/charm/bundles/osm-ha/bundle.yaml
@@
-31,23
+31,17
@@
description: |
applications:
zookeeper:
charm: zookeeper-k8s
applications:
zookeeper:
charm: zookeeper-k8s
- channel: latest/
edg
e
+ channel: latest/
stabl
e
scale: 3
storage:
data: 100M
scale: 3
storage:
data: 100M
- annotations:
- gui-x: 0
- gui-y: 500
kafka:
charm: kafka-k8s
kafka:
charm: kafka-k8s
- channel: latest/
edg
e
+ channel: latest/
stabl
e
scale: 3
trust: true
storage:
data: 100M
scale: 3
trust: true
storage:
data: 100M
- annotations:
- gui-x: 0
- gui-y: 250
mariadb:
charm: charmed-osm-mariadb-k8s
scale: 3
mariadb:
charm: charmed-osm-mariadb-k8s
scale: 3
@@
-59,9
+53,6
@@
applications:
root_password: osm4u
user: mano
ha-mode: true
root_password: osm4u
user: mano
ha-mode: true
- annotations:
- gui-x: -300
- gui-y: -250
mongodb:
charm: mongodb-k8s
channel: latest/stable
mongodb:
charm: mongodb-k8s
channel: latest/stable
@@
-69,12
+60,9
@@
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/
edg
e
+ channel: latest/
candidat
e
scale: 3
series: kubernetes
options:
scale: 3
series: kubernetes
options:
@@
-82,48
+70,36
@@
applications:
auth_backend: keystone
log_level: DEBUG
resources:
auth_backend: keystone
log_level: DEBUG
resources:
- image: opensourcemano/nbi:10.0.3
- annotations:
- gui-x: 0
- gui-y: -250
+ image: opensourcemano/nbi:10
ro:
charm: osm-ro
ro:
charm: osm-ro
- channel: latest/
edg
e
+ channel: latest/
candidat
e
scale: 3
series: kubernetes
options:
log_level: DEBUG
resources:
scale: 3
series: kubernetes
options:
log_level: DEBUG
resources:
- image: opensourcemano/ro:10.0.3
- annotations:
- gui-x: -300
- gui-y: 250
+ image: opensourcemano/ro:10
ng-ui:
charm: osm-ng-ui
ng-ui:
charm: osm-ng-ui
- channel: latest/
edg
e
+ channel: latest/
candidat
e
scale: 3
series: kubernetes
resources:
scale: 3
series: kubernetes
resources:
- image: opensourcemano/ng-ui:10.0.3
- annotations:
- gui-x: 600
- gui-y: 0
+ image: opensourcemano/ng-ui:10
lcm:
charm: osm-lcm
lcm:
charm: osm-lcm
- channel: latest/
edg
e
+ channel: latest/
candidat
e
scale: 3
series: kubernetes
options:
database_commonkey: osm
log_level: DEBUG
resources:
scale: 3
series: kubernetes
options:
database_commonkey: osm
log_level: DEBUG
resources:
- image: opensourcemano/lcm:10.0.3
- annotations:
- gui-x: -300
- gui-y: 0
+ image: opensourcemano/lcm:10
mon:
charm: osm-mon
mon:
charm: osm-mon
- channel: latest/
edg
e
+ channel: latest/
candidat
e
scale: 1
series: kubernetes
options:
scale: 1
series: kubernetes
options:
@@
-131,63
+107,45
@@
applications:
log_level: DEBUG
keystone_enabled: true
resources:
log_level: DEBUG
keystone_enabled: true
resources:
- image: opensourcemano/mon:10.0.3
- annotations:
- gui-x: 300
- gui-y: 0
+ image: opensourcemano/mon:10
pol:
charm: osm-pol
pol:
charm: osm-pol
- channel: latest/
edg
e
+ channel: latest/
candidat
e
scale: 3
series: kubernetes
options:
log_level: DEBUG
resources:
scale: 3
series: kubernetes
options:
log_level: DEBUG
resources:
- image: opensourcemano/pol:10.0.3
- annotations:
- gui-x: -300
- gui-y: 500
+ image: opensourcemano/pol:10
pla:
charm: osm-pla
pla:
charm: osm-pla
- channel: latest/
edg
e
+ channel: latest/
candidat
e
scale: 3
series: kubernetes
options:
log_level: DEBUG
resources:
scale: 3
series: kubernetes
options:
log_level: DEBUG
resources:
- image: opensourcemano/pla:10.0.3
- annotations:
- gui-x: 600
- gui-y: -250
+ image: opensourcemano/pla:10
prometheus:
charm: osm-prometheus
prometheus:
charm: osm-prometheus
- channel: latest/
edg
e
+ channel: latest/
candidat
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/
candidat
e
scale: 3
series: kubernetes
scale: 3
series: kubernetes
- annotations:
- gui-x: 300
- gui-y: 500
keystone:
charm: osm-keystone
keystone:
charm: osm-keystone
- channel: latest/
edg
e
+ channel: latest/
candidat
e
scale: 1
resources:
scale: 1
resources:
- keystone-image: opensourcemano/keystone:releaseten-daily
- annotations:
- gui-x: 300
- gui-y: -250
+ keystone-image: opensourcemano/keystone:10
relations:
- - grafana:prometheus
- prometheus:prometheus
relations:
- - grafana:prometheus
- prometheus:prometheus