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/local_osm_bundle.yaml b/installers/charm/local_osm_bundle.yaml
index 216718d..6ab0df6 100644
--- a/installers/charm/local_osm_bundle.yaml
+++ b/installers/charm/local_osm_bundle.yaml
@@ -11,23 +11,21 @@
# 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.
-description: Single instance OSM bundle
+name: osm
bundle: kubernetes
+description: Local bundle for development
applications:
zookeeper:
- charm: "./zookeeper/zookeeper.charm"
+ charm: zookeeper-k8s
+ channel: latest/edge
scale: 1
- series: kubernetes
storage:
- database: 100M
- resources:
- image: rocks.canonical.com:443/k8s.gcr.io/kubernetes-zookeeper:1.0-3.4.10
+ data: 100M
annotations:
gui-x: 0
- gui-y: 550
- mariadb-k8s:
- charm: "cs:~charmed-osm/mariadb-k8s"
- channel: "stable"
+ gui-y: 500
+ mariadb:
+ charm: charmed-osm-mariadb-k8s
scale: 1
series: kubernetes
storage:
@@ -37,21 +35,21 @@
root_password: osm4u
user: mano
annotations:
- gui-x: -250
- gui-y: -200
+ gui-x: -300
+ gui-y: -250
kafka:
- charm: "./kafka/kafka.charm"
+ charm: kafka-k8s
+ channel: latest/edge
scale: 1
- series: kubernetes
+ trust: true
storage:
- database: 100M
- resources:
- image: rocks.canonical.com:443/wurstmeister/kafka:2.12-2.2.1
+ data: 100M
annotations:
gui-x: 0
- gui-y: 300
+ gui-y: 250
mongodb:
- charm: ch:mongodb-k8s
+ charm: mongodb-k8s
+ channel: latest/stable
scale: 1
series: kubernetes
storage:
@@ -60,116 +58,121 @@
gui-x: 0
gui-y: 0
nbi:
- charm: "./nbi/nbi.charm"
+ charm: ./nbi/osm-nbi.charm
scale: 1
+ resources:
+ image: opensourcemano/nbi:testing-daily
series: kubernetes
options:
database_commonkey: osm
auth_backend: keystone
- resources:
- image: opensourcemano/nbi:testing-daily
+ log_level: DEBUG
annotations:
gui-x: 0
- gui-y: -200
+ gui-y: -250
ro:
- charm: "./ro/ro.charm"
+ charm: ./ro/osm-ro.charm
scale: 1
- series: kubernetes
resources:
image: opensourcemano/ro:testing-daily
- annotations:
- gui-x: -250
- gui-y: 300
- ng-ui:
- charm: "./ng-ui/ng-ui.charm"
- scale: 1
series: kubernetes
+ options:
+ log_level: DEBUG
+ annotations:
+ gui-x: -300
+ gui-y: 250
+ ng-ui:
+ charm: ./ng-ui/osm-ng-ui.charm
+ scale: 1
resources:
image: opensourcemano/ng-ui:testing-daily
- annotations:
- gui-x: 500
- gui-y: 100
- lcm:
- charm: "./lcm/lcm.charm"
- scale: 1
series: kubernetes
- options:
- database_commonkey: osm
+ annotations:
+ gui-x: 600
+ gui-y: 0
+ lcm:
+ charm: ./lcm/osm-lcm.charm
+ scale: 1
resources:
image: opensourcemano/lcm:testing-daily
- annotations:
- gui-x: -250
- gui-y: 50
- mon:
- charm: "./mon/mon.charm"
- scale: 1
series: kubernetes
options:
database_commonkey: osm
+ log_level: DEBUG
+ annotations:
+ gui-x: -300
+ gui-y: 0
+ mon:
+ charm: ./mon/osm-mon.charm
+ scale: 1
resources:
image: opensourcemano/mon:testing-daily
- annotations:
- gui-x: 250
- gui-y: 50
- pol:
- charm: "./pol/pol.charm"
- scale: 1
series: kubernetes
+ options:
+ database_commonkey: osm
+ log_level: DEBUG
+ keystone_enabled: true
+ annotations:
+ gui-x: 300
+ gui-y: 0
+ pol:
+ charm: ./pol/osm-pol.charm
+ scale: 1
resources:
image: opensourcemano/pol:testing-daily
- annotations:
- gui-x: -250
- gui-y: 550
- pla:
- charm: "./pla/pla.charm"
- scale: 1
series: kubernetes
+ options:
+ log_level: DEBUG
+ annotations:
+ gui-x: -300
+ gui-y: 500
+ pla:
+ charm: ./pla/osm-pla.charm
+ scale: 1
resources:
image: opensourcemano/pla:testing-daily
+ series: kubernetes
+ options:
+ log_level: DEBUG
annotations:
- gui-x: 500
- gui-y: -200
+ gui-x: 600
+ gui-y: -250
prometheus:
- charm: "./prometheus/prometheus.charm"
- channel: "stable"
+ charm: osm-prometheus
+ channel: latest/edge
scale: 1
series: kubernetes
storage:
data: 50M
options:
default-target: "mon:8000"
- resources:
- image: ubuntu/prometheus:latest
- backup-image: ed1000/prometheus-backup:latest
annotations:
- gui-x: 250
- gui-y: 300
+ gui-x: 300
+ gui-y: 250
grafana:
- charm: "./grafana/grafana.charm"
- channel: "stable"
+ charm: osm-grafana
+ channel: latest/edge
scale: 1
series: kubernetes
- resources:
- image: ubuntu/grafana:latest
annotations:
- gui-x: 250
- gui-y: 550
+ gui-x: 300
+ gui-y: 500
keystone:
- charm: "./keystone/keystone.charm"
+ charm: osm-keystone
+ channel: latest/edge
resources:
- image: opensourcemano/keystone:testing-daily
+ keystone-image: opensourcemano/keystone:testing-daily
scale: 1
- series: kubernetes
annotations:
- gui-x: -250
- gui-y: 550
+ gui-x: 300
+ gui-y: -250
relations:
- - grafana:prometheus
- prometheus:prometheus
- - kafka:zookeeper
- zookeeper:zookeeper
- - keystone:db
- - mariadb-k8s:mysql
+ - mariadb:mysql
- - lcm:kafka
- kafka:kafka
- - lcm:mongodb
@@ -206,7 +209,7 @@
- nbi:nbi
- - mon:keystone
- keystone:keystone
- - - mariadb-k8s:mysql
+ - - mariadb:mysql
- pol:mysql
- - - mariadb-k8s:mysql
- - grafana:db
+ - - grafana:db
+ - mariadb:mysql