projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix propagation of failures in installer scripts
[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
0843115
..
752cf56
100644
(file)
--- a/
installers/charm/bundles/osm-ha/bundle.yaml
+++ b/
installers/charm/bundles/osm-ha/bundle.yaml
@@
-28,8
+28,8
@@
description: |
- Availability of managed services
bundle: kubernetes
applications:
- Availability of managed services
bundle: kubernetes
applications:
- zookeeper
-k8s
:
- charm: "cs:~charmed-osm/zookeeper-
k8s
"
+ zookeeper:
+ charm: "cs:~charmed-osm/zookeeper-
1
"
channel: "stable"
scale: 3
series: kubernetes
channel: "stable"
scale: 3
series: kubernetes
@@
-55,8
+55,8
@@
applications:
annotations:
gui-x: -300
gui-y: -250
annotations:
gui-x: -300
gui-y: -250
- kafka
-k8s
:
- charm: "cs:~charmed-osm/kafka-
k8s
"
+ kafka:
+ charm: "cs:~charmed-osm/kafka-
1
"
channel: "stable"
scale: 3
series: kubernetes
channel: "stable"
scale: 3
series: kubernetes
@@
-68,22
+68,17
@@
applications:
annotations:
gui-x: 0
gui-y: 250
annotations:
gui-x: 0
gui-y: 250
- mongodb-k8s:
- charm: "cs:~charmed-osm/mongodb-k8s"
- channel: "stable"
+ mongodb:
+ charm: ch:mongodb-k8s
scale: 3
series: kubernetes
storage:
scale: 3
series: kubernetes
storage:
- database: 50M
- options:
- replica-set: rs0
- namespace: osm
- enable-sidecar: true
+ db: 50M
annotations:
gui-x: 0
gui-y: 0
nbi:
annotations:
gui-x: 0
gui-y: 0
nbi:
- charm: "cs:~charmed-osm/nbi-8"
+ charm: "cs:~charmed-osm/nbi-
1
8"
scale: 3
series: kubernetes
options:
scale: 3
series: kubernetes
options:
@@
-94,7
+89,7
@@
applications:
gui-x: 0
gui-y: -250
ro:
gui-x: 0
gui-y: -250
ro:
- charm: "cs:~charmed-osm/ro-
3
"
+ charm: "cs:~charmed-osm/ro-
10
"
scale: 3
series: kubernetes
options:
scale: 3
series: kubernetes
options:
@@
-103,14
+98,14
@@
applications:
gui-x: -300
gui-y: 250
ng-ui:
gui-x: -300
gui-y: 250
ng-ui:
- charm: "cs:~charmed-osm/ng-ui-
19
"
+ charm: "cs:~charmed-osm/ng-ui-
25
"
scale: 3
series: kubernetes
annotations:
gui-x: 600
gui-y: 0
lcm:
scale: 3
series: kubernetes
annotations:
gui-x: 600
gui-y: 0
lcm:
- charm: "cs:~charmed-osm/lcm-5"
+ charm: "cs:~charmed-osm/lcm-
1
5"
scale: 3
series: kubernetes
options:
scale: 3
series: kubernetes
options:
@@
-120,7
+115,7
@@
applications:
gui-x: -300
gui-y: 0
mon:
gui-x: -300
gui-y: 0
mon:
- charm: "cs:~charmed-osm/mon-
4
"
+ charm: "cs:~charmed-osm/mon-
12
"
scale: 1
series: kubernetes
options:
scale: 1
series: kubernetes
options:
@@
-131,7
+126,7
@@
applications:
gui-x: 300
gui-y: 0
pol:
gui-x: 300
gui-y: 0
pol:
- charm: "cs:~charmed-osm/pol-
3
"
+ charm: "cs:~charmed-osm/pol-
10
"
scale: 3
series: kubernetes
options:
scale: 3
series: kubernetes
options:
@@
-140,7
+135,7
@@
applications:
gui-x: -300
gui-y: 500
pla:
gui-x: -300
gui-y: 500
pla:
- charm: "cs:~charmed-osm/pla-
8
"
+ charm: "cs:~charmed-osm/pla-
13
"
scale: 3
series: kubernetes
options:
scale: 3
series: kubernetes
options:
@@
-149,7
+144,7
@@
applications:
gui-x: 600
gui-y: -250
prometheus:
gui-x: 600
gui-y: -250
prometheus:
- charm: "cs:~charmed-osm/prometheus-
2
"
+ charm: "cs:~charmed-osm/prometheus-
9
"
scale: 1
series: kubernetes
storage:
scale: 1
series: kubernetes
storage:
@@
-160,14
+155,14
@@
applications:
gui-x: 300
gui-y: 250
grafana:
gui-x: 300
gui-y: 250
grafana:
- charm: "cs:~charmed-osm/grafana-
2
"
+ charm: "cs:~charmed-osm/grafana-
10
"
scale: 3
series: kubernetes
annotations:
gui-x: 300
gui-y: 500
keystone:
scale: 3
series: kubernetes
annotations:
gui-x: 300
gui-y: 500
keystone:
- charm: "cs:~charmed-osm/keystone-
7
"
+ charm: "cs:~charmed-osm/keystone-
16
"
scale: 1
series: kubernetes
annotations:
scale: 1
series: kubernetes
annotations:
@@
-176,36
+171,36
@@
applications:
relations:
- - grafana:prometheus
- prometheus:prometheus
relations:
- - grafana:prometheus
- prometheus:prometheus
- - - kafka
-k8s
:zookeeper
- - zookeeper
-k8s
:zookeeper
+ - - kafka:zookeeper
+ - zookeeper:zookeeper
- - keystone:db
- mariadb-k8s:mysql
- - lcm:kafka
- - keystone:db
- mariadb-k8s:mysql
- - lcm:kafka
- - kafka
-k8s
:kafka
+ - kafka:kafka
- - lcm:mongodb
- - lcm:mongodb
- - mongodb
-k8s:mongo
+ - mongodb
:database
- - ro:ro
- lcm:ro
- - ro:kafka
- - ro:ro
- lcm:ro
- - ro:kafka
- - kafka
-k8s
:kafka
+ - kafka:kafka
- - ro:mongodb
- - ro:mongodb
- - mongodb
-k8s:mongo
+ - mongodb
:database
- - pol:kafka
- - pol:kafka
- - kafka
-k8s
:kafka
+ - kafka:kafka
- - pol:mongodb
- - pol:mongodb
- - mongodb
-k8s:mongo
+ - mongodb
:database
- - mon:mongodb
- - mon:mongodb
- - mongodb
-k8s:mongo
+ - mongodb
:database
- - mon:kafka
- - mon:kafka
- - kafka
-k8s
:kafka
+ - kafka:kafka
- - pla:kafka
- - pla:kafka
- - kafka
-k8s
:kafka
+ - kafka:kafka
- - pla:mongodb
- - pla:mongodb
- - mongodb
-k8s:mongo
+ - mongodb
:database
- - nbi:mongodb
- - nbi:mongodb
- - mongodb
-k8s:mongo
+ - mongodb
:database
- - nbi:kafka
- - nbi:kafka
- - kafka
-k8s
:kafka
+ - kafka:kafka
- - nbi:prometheus
- prometheus:prometheus
- - nbi:keystone
- - nbi:prometheus
- prometheus:prometheus
- - nbi:keystone
@@
-216,3
+211,7
@@
relations:
- nbi:nbi
- - mon:keystone
- keystone:keystone
- nbi:nbi
- - mon:keystone
- keystone:keystone
+ - - mariadb-k8s:mysql
+ - pol:mysql
+ - - grafana:db
+ - mariadb-k8s:mysql