projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
OSM beta bundles and charmed installer to deploy OSM sidecar charms
[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
27af107
..
7d1a446
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,84
+60,68
@@
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/stable
+ channel: latest/beta
+ trust: true
scale: 3
scale: 3
- series: kubernetes
options:
options:
- database_commonkey: osm
- auth_backend: keystone
- log_level: DEBUG
+ database-commonkey: osm
+ log-level: DEBUG
resources:
resources:
- image: opensourcemano/nbi:testing-daily
- annotations:
- gui-x: 0
- gui-y: -250
+ nbi-image: opensourcemano/nbi:testing-daily
ro:
charm: osm-ro
ro:
charm: osm-ro
- channel: latest/stable
+ channel: latest/beta
+ trust: true
scale: 3
scale: 3
- series: kubernetes
options:
options:
- log
_
level: DEBUG
+ log
-
level: DEBUG
resources:
resources:
- image: opensourcemano/ro:testing-daily
- annotations:
- gui-x: -300
- gui-y: 250
+ ro-image: opensourcemano/ro:testing-daily
ng-ui:
charm: osm-ng-ui
ng-ui:
charm: osm-ng-ui
- channel: latest/stable
+ channel: latest/beta
+ trust: true
scale: 3
scale: 3
- series: kubernetes
resources:
resources:
- image: opensourcemano/ng-ui:testing-daily
- annotations:
- gui-x: 600
- gui-y: 0
+ ng-ui-image: opensourcemano/ng-ui:testing-daily
lcm:
charm: osm-lcm
lcm:
charm: osm-lcm
- channel: latest/
stable
+ channel: latest/
beta
scale: 3
scale: 3
- series: kubernetes
options:
options:
- database
_
commonkey: osm
- log
_
level: DEBUG
+ database
-
commonkey: osm
+ log
-
level: DEBUG
resources:
resources:
- image: opensourcemano/lcm:testing-daily
- annotations:
- gui-x: -300
- gui-y: 0
+ lcm-image: opensourcemano/lcm:testing-daily
mon:
charm: osm-mon
mon:
charm: osm-mon
- channel: latest/stable
+ channel: latest/beta
+ trust: true
scale: 1
scale: 1
- series: kubernetes
options:
options:
- database
_
commonkey: osm
- log
_
level: DEBUG
- keystone
_
enabled: true
+ database
-
commonkey: osm
+ log
-
level: DEBUG
+ keystone
-
enabled: true
resources:
resources:
- image: opensourcemano/mon:testing-daily
- annotations:
- gui-x: 300
- gui-y: 0
+ mon-image: opensourcemano/mon:testing-daily
pol:
charm: osm-pol
pol:
charm: osm-pol
- channel: latest/
stable
+ channel: latest/
beta
scale: 3
scale: 3
- series: kubernetes
options:
options:
- log
_
level: DEBUG
+ log
-
level: DEBUG
resources:
resources:
- image: opensourcemano/pol:testing-daily
- annotations:
- gui-x: -300
- gui-y: 500
+ pol-image: opensourcemano/pol:testing-daily
+ vca:
+ charm: osm-vca-integrator
+ channel: latest/beta
+ scale: 1
+ ingress:
+ charm: nginx-ingress-integrator
+ channel: latest/stable
+ scale: 3
pla:
charm: osm-pla
channel: latest/stable
pla:
charm: osm-pla
channel: latest/stable
@@
-156,9
+131,6
@@
applications:
log_level: DEBUG
resources:
image: opensourcemano/pla:testing-daily
log_level: DEBUG
resources:
image: opensourcemano/pla:testing-daily
- annotations:
- gui-x: 600
- gui-y: -250
prometheus:
charm: osm-prometheus
channel: latest/stable
prometheus:
charm: osm-prometheus
channel: latest/stable
@@
-168,26
+140,17
@@
applications:
data: 50M
options:
default-target: "mon:8000"
data: 50M
options:
default-target: "mon:8000"
- annotations:
- gui-x: 300
- gui-y: 250
grafana:
charm: osm-grafana
channel: latest/stable
scale: 3
series: kubernetes
grafana:
charm: osm-grafana
channel: latest/stable
scale: 3
series: kubernetes
- annotations:
- gui-x: 300
- gui-y: 500
keystone:
charm: osm-keystone
channel: latest/stable
scale: 1
resources:
keystone-image: opensourcemano/keystone:testing-daily
keystone:
charm: osm-keystone
channel: latest/stable
scale: 1
resources:
keystone-image: opensourcemano/keystone:testing-daily
- annotations:
- gui-x: 300
- gui-y: -250
relations:
- - grafana:prometheus
- prometheus:prometheus
relations:
- - grafana:prometheus
- prometheus:prometheus
@@
-199,6
+162,8
@@
relations:
- kafka:kafka
- - lcm:mongodb
- mongodb:database
- kafka:kafka
- - lcm:mongodb
- mongodb:database
+ - - lcm:vca
+ - vca:vca
- - ro:ro
- lcm:ro
- - ro:kafka
- - ro:ro
- lcm:ro
- - ro:kafka
@@
-213,6
+178,8
@@
relations:
- mongodb:database
- - mon:kafka
- kafka:kafka
- mongodb:database
- - mon:kafka
- kafka:kafka
+ - - mon:vca
+ - vca:vca
- - pla:kafka
- kafka:kafka
- - pla:mongodb
- - pla:kafka
- kafka:kafka
- - pla:mongodb
@@
-221,6
+188,8
@@
relations:
- mongodb:database
- - nbi:kafka
- kafka:kafka
- mongodb:database
- - nbi:kafka
- kafka:kafka
+ - - nbi:ingress
+ - ingress:ingress
- - nbi:prometheus
- prometheus:prometheus
- - nbi:keystone
- - nbi:prometheus
- prometheus:prometheus
- - nbi:keystone
@@
-229,6
+198,8
@@
relations:
- prometheus:prometheus
- - ng-ui:nbi
- nbi:nbi
- prometheus:prometheus
- - ng-ui:nbi
- nbi:nbi
+ - - ng-ui:ingress
+ - ingress:ingress
- - mon:keystone
- keystone:keystone
- - mariadb:mysql
- - mon:keystone
- keystone:keystone
- - mariadb:mysql