projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fig bug 2338 for the LCM Dockerfile
[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
f20e598
..
ad94d4b
100644
(file)
--- a/
installers/charm/bundles/osm-ha/bundle.yaml
+++ b/
installers/charm/bundles/osm-ha/bundle.yaml
@@
-31,7
+31,7
@@
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
@@
-40,7
+40,7
@@
applications:
gui-y: 500
kafka:
charm: kafka-k8s
gui-y: 500
kafka:
charm: kafka-k8s
- channel: latest/
edg
e
+ channel: latest/
stabl
e
scale: 3
trust: true
storage:
scale: 3
trust: true
storage:
@@
-74,7
+74,7
@@
applications:
gui-y: 0
nbi:
charm: osm-nbi
gui-y: 0
nbi:
charm: osm-nbi
- channel:
latest/edg
e
+ channel:
12.0/stabl
e
scale: 3
series: kubernetes
options:
scale: 3
series: kubernetes
options:
@@
-82,48
+82,48
@@
applications:
auth_backend: keystone
log_level: DEBUG
resources:
auth_backend: keystone
log_level: DEBUG
resources:
- image: opensourcemano/nbi:
testing-daily
+ image: opensourcemano/nbi:
12
annotations:
gui-x: 0
gui-y: -250
ro:
charm: osm-ro
annotations:
gui-x: 0
gui-y: -250
ro:
charm: osm-ro
- channel:
latest/edg
e
+ channel:
12.0/stabl
e
scale: 3
series: kubernetes
options:
log_level: DEBUG
resources:
scale: 3
series: kubernetes
options:
log_level: DEBUG
resources:
- image: opensourcemano/ro:
testing-daily
+ image: opensourcemano/ro:
12
annotations:
gui-x: -300
gui-y: 250
ng-ui:
charm: osm-ng-ui
annotations:
gui-x: -300
gui-y: 250
ng-ui:
charm: osm-ng-ui
- channel:
latest/edg
e
+ channel:
12.0/stabl
e
scale: 3
series: kubernetes
resources:
scale: 3
series: kubernetes
resources:
- image: opensourcemano/ng-ui:
testing-daily
+ image: opensourcemano/ng-ui:
12
annotations:
gui-x: 600
gui-y: 0
lcm:
charm: osm-lcm
annotations:
gui-x: 600
gui-y: 0
lcm:
charm: osm-lcm
- channel:
latest/edg
e
+ channel:
12.0/stabl
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:
testing-daily
+ image: opensourcemano/lcm:
12
annotations:
gui-x: -300
gui-y: 0
mon:
charm: osm-mon
annotations:
gui-x: -300
gui-y: 0
mon:
charm: osm-mon
- channel:
latest/edg
e
+ channel:
12.0/stabl
e
scale: 1
series: kubernetes
options:
scale: 1
series: kubernetes
options:
@@
-131,37
+131,37
@@
applications:
log_level: DEBUG
keystone_enabled: true
resources:
log_level: DEBUG
keystone_enabled: true
resources:
- image: opensourcemano/mon:
testing-daily
+ image: opensourcemano/mon:
12
annotations:
gui-x: 300
gui-y: 0
pol:
charm: osm-pol
annotations:
gui-x: 300
gui-y: 0
pol:
charm: osm-pol
- channel:
latest/edg
e
+ channel:
12.0/stabl
e
scale: 3
series: kubernetes
options:
log_level: DEBUG
resources:
scale: 3
series: kubernetes
options:
log_level: DEBUG
resources:
- image: opensourcemano/pol:
testing-daily
+ image: opensourcemano/pol:
12
annotations:
gui-x: -300
gui-y: 500
pla:
charm: osm-pla
annotations:
gui-x: -300
gui-y: 500
pla:
charm: osm-pla
- channel: latest/
edg
e
+ channel: latest/
stabl
e
scale: 3
series: kubernetes
options:
log_level: DEBUG
resources:
scale: 3
series: kubernetes
options:
log_level: DEBUG
resources:
- image: opensourcemano/pla:
testing-daily
+ image: opensourcemano/pla:
12
annotations:
gui-x: 600
gui-y: -250
prometheus:
charm: osm-prometheus
annotations:
gui-x: 600
gui-y: -250
prometheus:
charm: osm-prometheus
- channel:
latest/edg
e
+ channel:
12.0/stabl
e
scale: 1
series: kubernetes
storage:
scale: 1
series: kubernetes
storage:
@@
-173,7
+173,7
@@
applications:
gui-y: 250
grafana:
charm: osm-grafana
gui-y: 250
grafana:
charm: osm-grafana
- channel:
latest/edg
e
+ channel:
12.0/stabl
e
scale: 3
series: kubernetes
annotations:
scale: 3
series: kubernetes
annotations:
@@
-181,10
+181,10
@@
applications:
gui-y: 500
keystone:
charm: osm-keystone
gui-y: 500
keystone:
charm: osm-keystone
- channel: latest/
edg
e
+ channel: latest/
stabl
e
scale: 1
resources:
scale: 1
resources:
- keystone-image: opensourcemano/keystone:
testing-daily
+ keystone-image: opensourcemano/keystone:
12
annotations:
gui-x: 300
gui-y: -250
annotations:
gui-x: 300
gui-y: -250