CharmHub and new kafka and zookeeper charms
- Charmed installer uses bundles published in CharmHub
- Use new zookeeper and kafka sidecar-charm
- Changes in the charms to integrate with the new Kafka
Change-Id: Ie59fe1c7c72774b317abe2433fafb28a11472b72
Signed-off-by: David Garcia <david.garcia@canonical.com>
diff --git a/installers/charm/bundles/.gitignore b/installers/charm/bundles/.gitignore
new file mode 100644
index 0000000..00b9f63
--- /dev/null
+++ b/installers/charm/bundles/.gitignore
@@ -0,0 +1,17 @@
+# Copyright 2022 ETSI
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+*.zip
+*build/
\ No newline at end of file
diff --git a/installers/charm/bundles/osm-ha/bundle.yaml b/installers/charm/bundles/osm-ha/bundle.yaml
index 202ee2b..f20e598 100644
--- a/installers/charm/bundles/osm-ha/bundle.yaml
+++ b/installers/charm/bundles/osm-ha/bundle.yaml
@@ -30,17 +30,24 @@
- Availability of managed services
applications:
zookeeper:
- charm: osm-zookeeper
+ charm: zookeeper-k8s
channel: latest/edge
scale: 3
- series: kubernetes
storage:
- database: 100M
- options:
- zookeeper-units: 3
+ data: 100M
annotations:
gui-x: 0
gui-y: 500
+ kafka:
+ charm: kafka-k8s
+ channel: latest/edge
+ scale: 3
+ trust: true
+ storage:
+ data: 100M
+ annotations:
+ gui-x: 0
+ gui-y: 250
mariadb:
charm: charmed-osm-mariadb-k8s
scale: 3
@@ -55,19 +62,6 @@
annotations:
gui-x: -300
gui-y: -250
- kafka:
- charm: osm-kafka
- channel: latest/edge
- scale: 3
- series: kubernetes
- storage:
- database: 100M
- options:
- zookeeper-units: 3
- kafka-units: 3
- annotations:
- gui-x: 0
- gui-y: 250
mongodb:
charm: mongodb-k8s
channel: latest/stable
@@ -87,6 +81,8 @@
database_commonkey: osm
auth_backend: keystone
log_level: DEBUG
+ resources:
+ image: opensourcemano/nbi:testing-daily
annotations:
gui-x: 0
gui-y: -250
@@ -97,6 +93,8 @@
series: kubernetes
options:
log_level: DEBUG
+ resources:
+ image: opensourcemano/ro:testing-daily
annotations:
gui-x: -300
gui-y: 250
@@ -105,6 +103,8 @@
channel: latest/edge
scale: 3
series: kubernetes
+ resources:
+ image: opensourcemano/ng-ui:testing-daily
annotations:
gui-x: 600
gui-y: 0
@@ -116,6 +116,8 @@
options:
database_commonkey: osm
log_level: DEBUG
+ resources:
+ image: opensourcemano/lcm:testing-daily
annotations:
gui-x: -300
gui-y: 0
@@ -128,6 +130,8 @@
database_commonkey: osm
log_level: DEBUG
keystone_enabled: true
+ resources:
+ image: opensourcemano/mon:testing-daily
annotations:
gui-x: 300
gui-y: 0
@@ -138,6 +142,8 @@
series: kubernetes
options:
log_level: DEBUG
+ resources:
+ image: opensourcemano/pol:testing-daily
annotations:
gui-x: -300
gui-y: 500
@@ -148,6 +154,8 @@
series: kubernetes
options:
log_level: DEBUG
+ resources:
+ image: opensourcemano/pla:testing-daily
annotations:
gui-x: 600
gui-y: -250
@@ -175,6 +183,8 @@
charm: osm-keystone
channel: latest/edge
scale: 1
+ resources:
+ keystone-image: opensourcemano/keystone:testing-daily
annotations:
gui-x: 300
gui-y: -250
diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml
index fa367dc..601e365 100644
--- a/installers/charm/bundles/osm/bundle.yaml
+++ b/installers/charm/bundles/osm/bundle.yaml
@@ -29,15 +29,24 @@
- Availability of managed services
applications:
zookeeper:
- charm: osm-zookeeper
+ charm: zookeeper-k8s
channel: latest/edge
scale: 1
- series: kubernetes
storage:
- database: 100M
+ data: 100M
annotations:
gui-x: 0
gui-y: 500
+ kafka:
+ charm: kafka-k8s
+ channel: latest/edge
+ scale: 1
+ trust: true
+ storage:
+ data: 100M
+ annotations:
+ gui-x: 0
+ gui-y: 250
mariadb:
charm: charmed-osm-mariadb-k8s
scale: 1
@@ -51,16 +60,6 @@
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
@@ -80,6 +79,8 @@
database_commonkey: osm
auth_backend: keystone
log_level: DEBUG
+ resources:
+ image: opensourcemano/nbi:testing-daily
annotations:
gui-x: 0
gui-y: -250
@@ -90,6 +91,8 @@
series: kubernetes
options:
log_level: DEBUG
+ resources:
+ image: opensourcemano/ro:testing-daily
annotations:
gui-x: -300
gui-y: 250
@@ -98,6 +101,8 @@
channel: latest/edge
scale: 1
series: kubernetes
+ resources:
+ image: opensourcemano/ng-ui:testing-daily
annotations:
gui-x: 600
gui-y: 0
@@ -109,6 +114,8 @@
options:
database_commonkey: osm
log_level: DEBUG
+ resources:
+ image: opensourcemano/lcm:testing-daily
annotations:
gui-x: -300
gui-y: 0
@@ -121,6 +128,8 @@
database_commonkey: osm
log_level: DEBUG
keystone_enabled: true
+ resources:
+ image: opensourcemano/mon:testing-daily
annotations:
gui-x: 300
gui-y: 0
@@ -131,6 +140,8 @@
series: kubernetes
options:
log_level: DEBUG
+ resources:
+ image: opensourcemano/pol:testing-daily
annotations:
gui-x: -300
gui-y: 500
@@ -141,6 +152,8 @@
series: kubernetes
options:
log_level: DEBUG
+ resources:
+ image: opensourcemano/pla:testing-daily
annotations:
gui-x: 600
gui-y: -250
@@ -168,6 +181,8 @@
charm: osm-keystone
channel: latest/edge
scale: 1
+ resources:
+ keystone-image: opensourcemano/keystone:testing-daily
annotations:
gui-x: 300
gui-y: -250