Use OSM bundles from CharmHub
Change-Id: I5e055b0558c445deeb2b6df9fad4e6a42fe25544
Signed-off-by: David Garcia <david.garcia@canonical.com>
diff --git a/installers/charm/bundles/osm-ha/README.md b/installers/charm/bundles/osm-ha/README.md
index 8a60592..da834a7 100644
--- a/installers/charm/bundles/osm-ha/README.md
+++ b/installers/charm/bundles/osm-ha/README.md
@@ -1,5 +1,5 @@
<!--
- Copyright 2020 Canonical Ltd.
+ Copyright 2022 Canonical Ltd.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -13,15 +13,12 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-# Installation
-
-Go to the [OSM User Guide](https://osm.etsi.org/docs/user-guide/03-installing-osm.html#charmed-installation) for the highly available production-grade deployment.
-For a more minimal cluster suitable for testing, deploy the [single instance OSM bundle](https://jaas.ai/osm/bundle).
+# Charmed OSM
# Bundle Components
- [grafana](https://jaas.ai/u/charmed-osm/grafana/0): A CAAS charm to deploy grafana for metrics visualization
-- [kafka k8s](https://jaas.ai/u/charmed-osm/kafka-k8s): A CAAS charm to deploy Kafka used as a messaging bus between OSM components
+- [kafka k8s](https://charmhub.io/kafka-k8s): A CAAS charm to deploy Kafka used as a messaging bus between OSM components
- [lcm](https://jaas.ai/u/charmed-osm/lcm/0): A CAAS charm to deploy OSM's Lifecycle Management (LCM) component responsible for network services orchestration.
- [mariadb k8s](https://jaas.ai/u/charmed-osm/mariadb-k8s): A Juju charm deploying and managing database server (MariaDB) on Kubernetes
- [mon](https://jaas.ai/u/charmed-osm/mon/0): A CAAS charm to deploy OSM's Monitoring Interface (MON) responsible for metrics collection
@@ -39,8 +36,4 @@
You can directly contact the team:
-- David García ([david.garcia@canonical.com](david.garcia@canonical.com))
-- Eduardo Sousa ([eduardo.sousa@canonical.com](eduardo.sousa@canonical.com))
-- Mark Beierl ([mark.beierl@canonical.com](mark.beierl@canonical.com))
-- Guillermo Calvino ([guillermo.calvino@canonical.com](guillermo.calvino@canonical.com))
-- Wajeeha Hamid ([wajeeha.hamid@canonical.com](wajeeha.hamid@canonical.com))
+-
\ 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 752cf56..e22540b 100644
--- a/installers/charm/bundles/osm-ha/bundle.yaml
+++ b/installers/charm/bundles/osm-ha/bundle.yaml
@@ -11,6 +11,8 @@
# 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.
+name: osm-ha
+bundle: kubernetes
description: |
**A high-available Charmed OSM cluster**
@@ -26,23 +28,28 @@
- Highly Available and resilient against failures
- Supported with Ubuntu Advantage
- Availability of managed services
-bundle: kubernetes
applications:
zookeeper:
- charm: "cs:~charmed-osm/zookeeper-1"
- channel: "stable"
+ 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
- mariadb-k8s:
- charm: "cs:~charmed-osm/mariadb-k8s"
- channel: "stable"
+ 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
series: kubernetes
storage:
@@ -55,21 +62,9 @@
annotations:
gui-x: -300
gui-y: -250
- kafka:
- charm: "cs:~charmed-osm/kafka-1"
- channel: "stable"
- scale: 3
- series: kubernetes
- storage:
- database: 100M
- options:
- zookeeper-units: 3
- kafka-units: 3
- annotations:
- gui-x: 0
- gui-y: 250
mongodb:
- charm: ch:mongodb-k8s
+ charm: mongodb-k8s
+ channel: latest/stable
scale: 3
series: kubernetes
storage:
@@ -78,73 +73,95 @@
gui-x: 0
gui-y: 0
nbi:
- charm: "cs:~charmed-osm/nbi-18"
+ charm: osm-nbi
+ channel: latest/edge
scale: 3
series: kubernetes
options:
database_commonkey: osm
auth_backend: keystone
log_level: DEBUG
+ resources:
+ image: opensourcemano/nbi:11.0.1
annotations:
gui-x: 0
gui-y: -250
ro:
- charm: "cs:~charmed-osm/ro-10"
+ charm: osm-ro
+ channel: latest/edge
scale: 3
series: kubernetes
options:
log_level: DEBUG
+ resources:
+ image: opensourcemano/ro:11.0.1
annotations:
gui-x: -300
gui-y: 250
ng-ui:
- charm: "cs:~charmed-osm/ng-ui-25"
+ charm: osm-ng-ui
+ channel: latest/edge
scale: 3
series: kubernetes
+ resources:
+ image: opensourcemano/ng-ui:11.0.1
annotations:
gui-x: 600
gui-y: 0
lcm:
- charm: "cs:~charmed-osm/lcm-15"
+ charm: osm-lcm
+ channel: latest/edge
scale: 3
series: kubernetes
options:
database_commonkey: osm
log_level: DEBUG
+ resources:
+ image: opensourcemano/lcm:11.0.1
annotations:
gui-x: -300
gui-y: 0
mon:
- charm: "cs:~charmed-osm/mon-12"
+ charm: osm-mon
+ channel: latest/edge
scale: 1
series: kubernetes
options:
database_commonkey: osm
log_level: DEBUG
keystone_enabled: true
+ resources:
+ image: opensourcemano/mon:11.0.1
annotations:
gui-x: 300
gui-y: 0
pol:
- charm: "cs:~charmed-osm/pol-10"
+ charm: osm-pol
+ channel: latest/edge
scale: 3
series: kubernetes
options:
log_level: DEBUG
+ resources:
+ image: opensourcemano/pol:11.0.1
annotations:
gui-x: -300
gui-y: 500
pla:
- charm: "cs:~charmed-osm/pla-13"
+ charm: osm-pla
+ channel: latest/edge
scale: 3
series: kubernetes
options:
log_level: DEBUG
+ resources:
+ image: opensourcemano/pla:11.0.1
annotations:
gui-x: 600
gui-y: -250
prometheus:
- charm: "cs:~charmed-osm/prometheus-9"
+ charm: osm-prometheus
+ channel: latest/edge
scale: 1
series: kubernetes
storage:
@@ -155,16 +172,19 @@
gui-x: 300
gui-y: 250
grafana:
- charm: "cs:~charmed-osm/grafana-10"
+ charm: osm-grafana
+ channel: latest/edge
scale: 3
series: kubernetes
annotations:
gui-x: 300
gui-y: 500
keystone:
- charm: "cs:~charmed-osm/keystone-16"
+ charm: osm-keystone
+ channel: latest/edge
scale: 1
- series: kubernetes
+ resources:
+ keystone-image: opensourcemano/keystone:releaseeleven-daily
annotations:
gui-x: 300
gui-y: -250
@@ -174,7 +194,7 @@
- - kafka:zookeeper
- zookeeper:zookeeper
- - keystone:db
- - mariadb-k8s:mysql
+ - mariadb:mysql
- - lcm:kafka
- kafka:kafka
- - lcm:mongodb
@@ -211,7 +231,7 @@
- nbi:nbi
- - mon:keystone
- keystone:keystone
- - - mariadb-k8s:mysql
+ - - mariadb:mysql
- pol:mysql
- - grafana:db
- - mariadb-k8s:mysql
+ - mariadb:mysql
diff --git a/installers/charm/bundles/osm-ha/charmcraft.yaml b/installers/charm/bundles/osm-ha/charmcraft.yaml
new file mode 100644
index 0000000..111b05c
--- /dev/null
+++ b/installers/charm/bundles/osm-ha/charmcraft.yaml
@@ -0,0 +1,14 @@
+# Copyright 2022 Canonical Ltd.
+#
+# 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.
+type: bundle