stsstack-bundles

Merge ~tiago.pasqualini/stsstack-bundles:osmfix into stsstack-bundles:master

  1. Git
  2. lp:~tiago.pasqualini/stsstack-bundles
  3. osmfix
  4. Merge into master
Proposed by Tiago Pasqualini da Silva
Status: Merged
Merged at revision: 3a1a986fc24f81577f36eb25614eeb9e8d80437c
Proposed branch: ~tiago.pasqualini/stsstack-bundles:osmfix
Merge into: stsstack-bundles:master
Diff against target: 202 lines (+26/-54)
1 file modified
osm/osm.yaml.template (+26/-54)
Reviewer Review Type Date Requested Status
Jolly Bundlers Pending
Review via email: mp+413318@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/osm/osm.yaml.template b/osm/osm.yaml.template
2index d8f7947..56c3f58 100644
3--- a/osm/osm.yaml.template
4+++ b/osm/osm.yaml.template
5@@ -6,40 +6,30 @@ bastion_ip: &bastion_ip __BASTION_IP__
6 bundle: kubernetes
7 applications:
8 grafana-k8s:
9- charm: cs:~charmed-osm/grafana-k8s
10+ charm: cs:~charmed-osm/grafana-10
11 scale: 1
12 series: kubernetes
13 annotations:
14 gui-x: "500"
15 gui-y: "1100"
16 kafka-k8s:
17- charm: cs:~charmed-osm/kafka-k8s
18+ charm: cs:~charmed-osm/kafka-0
19 scale: 1
20 series: kubernetes
21 storage:
22 database: 100M
23- options:
24- advertised-hostname: kafka-k8s
25- advertised-port: 9092
26- kafka-units: 1
27- zookeeper-service-name: zookeeper-k8s-endpoints
28- zookeeper-units: 1
29 annotations:
30 gui-x: "0"
31 gui-y: "600"
32 lcm-k8s:
33- charm: cs:~charmed-osm/lcm-k8s
34+ charm: cs:~charmed-osm/lcm-15
35 scale: 1
36 series: kubernetes
37- storage:
38- packages: 50M
39 options:
40 vca_host: vca
41 vca_port: 17070
42 vca_user: admin
43- vca_password: secret
44- DATABASE_COMMONKEY: osm
45- use_external_vca: false
46+ database_commonkey: osm
47 vca_pubkey: *juju_pubkey
48 vca_cacert: *juju_cacert
49 vca_apiproxy: *bastion_ip
50@@ -65,24 +55,14 @@ applications:
51 gui-x: "-500"
52 gui-y: "-400"
53 mon-k8s:
54- charm: cs:~charmed-osm/mon-k8s
55+ charm: cs:~charmed-osm/mon-12
56 scale: 1
57 series: kubernetes
58- storage:
59- database: 100M
60 options:
61- OSMMON_COLLECTOR_INTERVAL: 30
62- OSMMON_DATABASE_COMMONKEY: osm
63- OSMMON_EVALUATOR_INTERVAL: 30
64- OSMMON_GLOBAL_LOGLEVEL: INFO
65- OSMMON_GLOBAL_REQUEST_TIMEOUT: 10
66- OSMMON_OPENSTACK_DEFAULT_GRANULARITY: 300
67- use_external_vca: false
68+ database_commonkey: osm
69 vca_host: vca
70 vca_user: admin
71- vca_password: secret
72 vca_cacert: *juju_cacert
73- use_external_vca: false
74 annotations:
75 gui-x: "500"
76 gui-y: "100"
77@@ -103,73 +83,59 @@ applications:
78 gui-x: "0"
79 gui-y: "100"
80 nbi-k8s:
81- charm: cs:~charmed-osm/nbi-k8s
82+ charm: cs:~charmed-osm/nbi-18
83 scale: 1
84 series: kubernetes
85- storage:
86- packages: 50M
87 options:
88- DATABASE_COMMONKEY: osm
89+ database_commonkey: osm
90 log_level: INFO
91 annotations:
92 gui-x: "0"
93 gui-y: "-400"
94 pol-k8s:
95- charm: cs:~charmed-osm/pol-k8s
96+ charm: cs:~charmed-osm/pol-10
97 scale: 1
98 series: kubernetes
99- storage:
100- database: 100M
101 options:
102 log_level: INFO
103 annotations:
104 gui-x: "-500"
105 gui-y: "1100"
106 prometheus-k8s:
107- charm: cs:~charmed-osm/prometheus-k8s
108+ charm: cs:~charmed-osm/prometheus-9
109 scale: 1
110 series: kubernetes
111 storage:
112- database: 50M
113+ data: 50M
114 options:
115- advertised-port: 9090
116 default-target: mon-k8s:8000
117 web-subpath: /
118 annotations:
119 gui-x: "500"
120 gui-y: "600"
121 ro-k8s:
122- charm: cs:~charmed-osm/ro-k8s
123+ charm: cs:~charmed-osm/ro-10
124 scale: 1
125 series: kubernetes
126- storage:
127- log: 50M
128 options:
129- OPENMANO_TENANT: osm
130 ro_database: mano_db
131 vim_database: mano_vim_db
132 annotations:
133 gui-x: "-500"
134 gui-y: "600"
135 ui-k8s:
136- charm: cs:~charmed-osm/ui-k8s
137+ charm: cs:~charmed-osm/ng-ui-25
138 scale: 1
139 series: kubernetes
140- options:
141- mysql_database: lwui
142 annotations:
143 gui-x: "500"
144 gui-y: "-400"
145 zookeeper-k8s:
146- charm: cs:~charmed-osm/zookeeper-k8s
147+ charm: cs:~charmed-osm/zookeeper-0
148 scale: 1
149 series: kubernetes
150 storage:
151 database: 100M
152- options:
153- leader-election-port: 3888
154- server-port: 2888
155- zookeeper-units: 1
156 annotations:
157 gui-x: "0"
158 gui-y: "1100"
159@@ -178,21 +144,21 @@ relations:
160 - zookeeper-k8s:zookeeper
161 - - ro-k8s:mysql
162 - mariadb-k8s:mysql
163-- - nbi-k8s:mongo
164+- - nbi-k8s:mongodb
165 - mongodb-k8s:mongo
166 - - nbi-k8s:kafka
167 - kafka-k8s:kafka
168 - - lcm-k8s:kafka
169 - kafka-k8s:kafka
170-- - lcm-k8s:mongo
171+- - lcm-k8s:mongodb
172 - mongodb-k8s:mongo
173 - - mon-k8s:kafka
174 - kafka-k8s:kafka
175-- - mon-k8s:mongo
176+- - mon-k8s:mongodb
177 - mongodb-k8s:mongo
178 - - pol-k8s:kafka
179 - kafka-k8s:kafka
180-- - pol-k8s:mongo
181+- - pol-k8s:mongodb
182 - mongodb-k8s:mongo
183 - - lcm-k8s:ro
184 - ro-k8s:ro
185@@ -200,9 +166,15 @@ relations:
186 - mon-k8s:prometheus
187 - - grafana-k8s:prometheus
188 - prometheus-k8s:prometheus
189-- - ui-k8s:mysql
190- - mariadb-k8s:mysql
191 - - ui-k8s:nbi
192 - nbi-k8s:nbi
193 - - prometheus-k8s:prometheus
194 - nbi-k8s:prometheus
195+- - grafana-k8s:db
196+ - mariadb-k8s:mysql
197+- - pol-k8s:mysql
198+ - mariadb-k8s:mysql
199+- - ro-k8s:kafka
200+ - kafka-k8s:kafka
201+- - ro-k8s:mongodb
202+ - mongodb-k8s:mongo

Subscribers

People subscribed via source and target branches