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
/
bundle.yaml
diff --git
a/installers/charm/bundles/osm/bundle.yaml
b/installers/charm/bundles/osm/bundle.yaml
index
36322fe
..
9031388
100644
(file)
--- a/
installers/charm/bundles/osm/bundle.yaml
+++ b/
installers/charm/bundles/osm/bundle.yaml
@@
-27,9
+27,8
@@
description: |
- Availability of managed services
bundle: kubernetes
applications:
- Availability of managed services
bundle: kubernetes
applications:
- zookeeper-k8s:
- charm: "cs:~charmed-osm/zookeeper-k8s"
- channel: "stable"
+ zookeeper:
+ charm: "cs:~charmed-osm/zookeeper-1"
scale: 1
series: kubernetes
storage:
scale: 1
series: kubernetes
storage:
@@
-51,9
+50,8
@@
applications:
annotations:
gui-x: -300
gui-y: -250
annotations:
gui-x: -300
gui-y: -250
- kafka-k8s:
- charm: "cs:~charmed-osm/kafka-k8s"
- channel: "stable"
+ kafka:
+ charm: "cs:~charmed-osm/kafka-1"
scale: 1
series: kubernetes
storage:
scale: 1
series: kubernetes
storage:
@@
-71,7
+69,7
@@
applications:
gui-x: 0
gui-y: 0
nbi:
gui-x: 0
gui-y: 0
nbi:
- charm: "cs:~charmed-osm/nbi-1
6
"
+ charm: "cs:~charmed-osm/nbi-1
8
"
scale: 1
series: kubernetes
options:
scale: 1
series: kubernetes
options:
@@
-82,7
+80,7
@@
applications:
gui-x: 0
gui-y: -250
ro:
gui-x: 0
gui-y: -250
ro:
- charm: "cs:~charmed-osm/ro-
8
"
+ charm: "cs:~charmed-osm/ro-
10
"
scale: 1
series: kubernetes
options:
scale: 1
series: kubernetes
options:
@@
-91,14
+89,14
@@
applications:
gui-x: -300
gui-y: 250
ng-ui:
gui-x: -300
gui-y: 250
ng-ui:
- charm: "cs:~charmed-osm/ng-ui-2
3
"
+ charm: "cs:~charmed-osm/ng-ui-2
5
"
scale: 1
series: kubernetes
annotations:
gui-x: 600
gui-y: 0
lcm:
scale: 1
series: kubernetes
annotations:
gui-x: 600
gui-y: 0
lcm:
- charm: "cs:~charmed-osm/lcm-1
3
"
+ charm: "cs:~charmed-osm/lcm-1
5
"
scale: 1
series: kubernetes
options:
scale: 1
series: kubernetes
options:
@@
-108,7
+106,7
@@
applications:
gui-x: -300
gui-y: 0
mon:
gui-x: -300
gui-y: 0
mon:
- charm: "cs:~charmed-osm/mon-
9
"
+ charm: "cs:~charmed-osm/mon-
12
"
scale: 1
series: kubernetes
options:
scale: 1
series: kubernetes
options:
@@
-119,7
+117,7
@@
applications:
gui-x: 300
gui-y: 0
pol:
gui-x: 300
gui-y: 0
pol:
- charm: "cs:~charmed-osm/pol-
8
"
+ charm: "cs:~charmed-osm/pol-
10
"
scale: 1
series: kubernetes
options:
scale: 1
series: kubernetes
options:
@@
-128,7
+126,7
@@
applications:
gui-x: -300
gui-y: 500
pla:
gui-x: -300
gui-y: 500
pla:
- charm: "cs:~charmed-osm/pla-1
1
"
+ charm: "cs:~charmed-osm/pla-1
3
"
scale: 1
series: kubernetes
options:
scale: 1
series: kubernetes
options:
@@
-137,7
+135,7
@@
applications:
gui-x: 600
gui-y: -250
prometheus:
gui-x: 600
gui-y: -250
prometheus:
- charm: "cs:~charmed-osm/prometheus-
6
"
+ charm: "cs:~charmed-osm/prometheus-
9
"
scale: 1
series: kubernetes
storage:
scale: 1
series: kubernetes
storage:
@@
-148,14
+146,14
@@
applications:
gui-x: 300
gui-y: 250
grafana:
gui-x: 300
gui-y: 250
grafana:
- charm: "cs:~charmed-osm/grafana-
6
"
+ charm: "cs:~charmed-osm/grafana-
10
"
scale: 1
series: kubernetes
annotations:
gui-x: 300
gui-y: 500
keystone:
scale: 1
series: kubernetes
annotations:
gui-x: 300
gui-y: 500
keystone:
- charm: "cs:~charmed-osm/keystone-1
2
"
+ charm: "cs:~charmed-osm/keystone-1
6
"
scale: 1
series: kubernetes
annotations:
scale: 1
series: kubernetes
annotations:
@@
-164,36
+162,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
- mongodb:database
- - ro:ro
- lcm:ro
- - ro:kafka
- - lcm:mongodb
- mongodb:database
- - ro:ro
- lcm:ro
- - ro:kafka
- - kafka
-k8s
:kafka
+ - kafka:kafka
- - ro:mongodb
- mongodb:database
- - pol:kafka
- - ro:mongodb
- mongodb:database
- - pol:kafka
- - kafka
-k8s
:kafka
+ - kafka:kafka
- - pol:mongodb
- mongodb:database
- - mon:mongodb
- mongodb:database
- - mon:kafka
- - pol:mongodb
- mongodb:database
- - mon:mongodb
- mongodb:database
- - mon:kafka
- - kafka
-k8s
:kafka
+ - kafka:kafka
- - pla:kafka
- - pla:kafka
- - kafka
-k8s
:kafka
+ - kafka:kafka
- - pla:mongodb
- mongodb:database
- - nbi:mongodb
- mongodb:database
- - nbi:kafka
- - pla:mongodb
- mongodb:database
- - nbi:mongodb
- mongodb:database
- - nbi:kafka
- - kafka
-k8s
:kafka
+ - kafka:kafka
- - nbi:prometheus
- prometheus:prometheus
- - nbi:keystone
- - nbi:prometheus
- prometheus:prometheus
- - nbi:keystone
@@
-206,3
+204,5
@@
relations:
- keystone:keystone
- - mariadb-k8s:mysql
- pol:mysql
- keystone:keystone
- - mariadb-k8s:mysql
- pol:mysql
+ - - grafana:db
+ - mariadb-k8s:mysql