projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug 1778 - Adding openstack client to Keystone dockerfile
[osm/devops.git]
/
installers
/
charm
/
local_osm_bundle.yaml
diff --git
a/installers/charm/local_osm_bundle.yaml
b/installers/charm/local_osm_bundle.yaml
index
e8198eb
..
216718d
100644
(file)
--- a/
installers/charm/local_osm_bundle.yaml
+++ b/
installers/charm/local_osm_bundle.yaml
@@
-14,13
+14,14
@@
description: Single instance OSM bundle
bundle: kubernetes
applications:
description: Single instance OSM bundle
bundle: kubernetes
applications:
- zookeeper-k8s:
- charm: "cs:~charmed-osm/zookeeper-k8s"
- channel: "stable"
+ zookeeper:
+ charm: "./zookeeper/zookeeper.charm"
scale: 1
series: kubernetes
storage:
database: 100M
scale: 1
series: kubernetes
storage:
database: 100M
+ resources:
+ image: rocks.canonical.com:443/k8s.gcr.io/kubernetes-zookeeper:1.0-3.4.10
annotations:
gui-x: 0
gui-y: 550
annotations:
gui-x: 0
gui-y: 550
@@
-38,13
+39,14
@@
applications:
annotations:
gui-x: -250
gui-y: -200
annotations:
gui-x: -250
gui-y: -200
- kafka-k8s:
- charm: "cs:~charmed-osm/kafka-k8s"
- channel: "stable"
+ kafka:
+ charm: "./kafka/kafka.charm"
scale: 1
series: kubernetes
storage:
database: 100M
scale: 1
series: kubernetes
storage:
database: 100M
+ resources:
+ image: rocks.canonical.com:443/wurstmeister/kafka:2.12-2.2.1
annotations:
gui-x: 0
gui-y: 300
annotations:
gui-x: 0
gui-y: 300
@@
-119,7
+121,7
@@
applications:
gui-x: -250
gui-y: 550
pla:
gui-x: -250
gui-y: 550
pla:
- charm: "./pla/
build
"
+ charm: "./pla/
pla.charm
"
scale: 1
series: kubernetes
resources:
scale: 1
series: kubernetes
resources:
@@
-164,36
+166,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
+208,5
@@
relations:
- keystone:keystone
- - mariadb-k8s:mysql
- pol:mysql
- keystone:keystone
- - mariadb-k8s:mysql
- pol:mysql
+ - - mariadb-k8s:mysql
+ - grafana:db