projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Removing charm promotion
[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
fa367dc
..
1c19390
100644
(file)
--- a/
installers/charm/bundles/osm/bundle.yaml
+++ b/
installers/charm/bundles/osm/bundle.yaml
@@
-29,15
+29,24
@@
description: |
- Availability of managed services
applications:
zookeeper:
- Availability of managed services
applications:
zookeeper:
- charm:
osm-zookeeper
- channel: latest/
edg
e
+ charm:
zookeeper-k8s
+ channel: latest/
stabl
e
scale: 1
scale: 1
- series: kubernetes
storage:
storage:
- data
base
: 100M
+ data: 100M
annotations:
gui-x: 0
gui-y: 500
annotations:
gui-x: 0
gui-y: 500
+ kafka:
+ charm: kafka-k8s
+ channel: latest/stable
+ scale: 1
+ trust: true
+ storage:
+ data: 100M
+ annotations:
+ gui-x: 0
+ gui-y: 250
mariadb:
charm: charmed-osm-mariadb-k8s
scale: 1
mariadb:
charm: charmed-osm-mariadb-k8s
scale: 1
@@
-51,16
+60,6
@@
applications:
annotations:
gui-x: -300
gui-y: -250
annotations:
gui-x: -300
gui-y: -250
- kafka:
- charm: osm-kafka
- channel: latest/edge
- scale: 1
- series: kubernetes
- storage:
- database: 100M
- annotations:
- gui-x: 0
- gui-y: 250
mongodb:
charm: mongodb-k8s
channel: latest/stable
mongodb:
charm: mongodb-k8s
channel: latest/stable
@@
-73,80
+72,94
@@
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: 1
series: kubernetes
options:
database_commonkey: osm
auth_backend: keystone
log_level: DEBUG
scale: 1
series: kubernetes
options:
database_commonkey: osm
auth_backend: keystone
log_level: DEBUG
+ resources:
+ 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: 1
series: kubernetes
options:
log_level: DEBUG
scale: 1
series: kubernetes
options:
log_level: DEBUG
+ resources:
+ 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: 1
series: kubernetes
scale: 1
series: kubernetes
+ resources:
+ 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: 1
series: kubernetes
options:
database_commonkey: osm
log_level: DEBUG
scale: 1
series: kubernetes
options:
database_commonkey: osm
log_level: DEBUG
+ resources:
+ 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:
database_commonkey: osm
log_level: DEBUG
keystone_enabled: true
scale: 1
series: kubernetes
options:
database_commonkey: osm
log_level: DEBUG
keystone_enabled: true
+ resources:
+ 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: 1
series: kubernetes
options:
log_level: DEBUG
scale: 1
series: kubernetes
options:
log_level: DEBUG
+ resources:
+ 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: 1
series: kubernetes
options:
log_level: DEBUG
scale: 1
series: kubernetes
options:
log_level: DEBUG
+ resources:
+ 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:
@@
-158,7
+171,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: 1
series: kubernetes
annotations:
scale: 1
series: kubernetes
annotations:
@@
-166,8
+179,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
scale: 1
+ resources:
+ keystone-image: opensourcemano/keystone:12
annotations:
gui-x: 300
gui-y: -250
annotations:
gui-x: 300
gui-y: -250