Charmed OSM: migration to CharmHub
Change-Id: I7dd740b0ed007360767998372f97c53b5269fdf4
Signed-off-by: David Garcia <david.garcia@canonical.com>
diff --git a/installers/charm/bundles/osm-ha/bundle.yaml b/installers/charm/bundles/osm-ha/bundle.yaml
index 752cf56..202ee2b 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,11 +28,10 @@
- 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: osm-zookeeper
+ channel: latest/edge
scale: 3
series: kubernetes
storage:
@@ -40,9 +41,8 @@
annotations:
gui-x: 0
gui-y: 500
- mariadb-k8s:
- charm: "cs:~charmed-osm/mariadb-k8s"
- channel: "stable"
+ mariadb:
+ charm: charmed-osm-mariadb-k8s
scale: 3
series: kubernetes
storage:
@@ -56,8 +56,8 @@
gui-x: -300
gui-y: -250
kafka:
- charm: "cs:~charmed-osm/kafka-1"
- channel: "stable"
+ charm: osm-kafka
+ channel: latest/edge
scale: 3
series: kubernetes
storage:
@@ -69,7 +69,8 @@
gui-x: 0
gui-y: 250
mongodb:
- charm: ch:mongodb-k8s
+ charm: mongodb-k8s
+ channel: latest/stable
scale: 3
series: kubernetes
storage:
@@ -78,7 +79,8 @@
gui-x: 0
gui-y: 0
nbi:
- charm: "cs:~charmed-osm/nbi-18"
+ charm: osm-nbi
+ channel: latest/edge
scale: 3
series: kubernetes
options:
@@ -89,7 +91,8 @@
gui-x: 0
gui-y: -250
ro:
- charm: "cs:~charmed-osm/ro-10"
+ charm: osm-ro
+ channel: latest/edge
scale: 3
series: kubernetes
options:
@@ -98,14 +101,16 @@
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
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:
@@ -115,7 +120,8 @@
gui-x: -300
gui-y: 0
mon:
- charm: "cs:~charmed-osm/mon-12"
+ charm: osm-mon
+ channel: latest/edge
scale: 1
series: kubernetes
options:
@@ -126,7 +132,8 @@
gui-x: 300
gui-y: 0
pol:
- charm: "cs:~charmed-osm/pol-10"
+ charm: osm-pol
+ channel: latest/edge
scale: 3
series: kubernetes
options:
@@ -135,7 +142,8 @@
gui-x: -300
gui-y: 500
pla:
- charm: "cs:~charmed-osm/pla-13"
+ charm: osm-pla
+ channel: latest/edge
scale: 3
series: kubernetes
options:
@@ -144,7 +152,8 @@
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 +164,17 @@
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
annotations:
gui-x: 300
gui-y: -250
@@ -174,7 +184,7 @@
- - kafka:zookeeper
- zookeeper:zookeeper
- - keystone:db
- - mariadb-k8s:mysql
+ - mariadb:mysql
- - lcm:kafka
- kafka:kafka
- - lcm:mongodb
@@ -211,7 +221,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
diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml
index 9031388..fa367dc 100644
--- a/installers/charm/bundles/osm/bundle.yaml
+++ b/installers/charm/bundles/osm/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
+bundle: kubernetes
description: |
**Single instance Charmed OSM**
@@ -25,10 +27,10 @@
- Stable and secure
- Supported with Ubuntu Advantage
- Availability of managed services
-bundle: kubernetes
applications:
zookeeper:
- charm: "cs:~charmed-osm/zookeeper-1"
+ charm: osm-zookeeper
+ channel: latest/edge
scale: 1
series: kubernetes
storage:
@@ -36,9 +38,8 @@
annotations:
gui-x: 0
gui-y: 500
- mariadb-k8s:
- charm: "cs:~charmed-osm/mariadb-k8s"
- channel: "stable"
+ mariadb:
+ charm: charmed-osm-mariadb-k8s
scale: 1
series: kubernetes
storage:
@@ -51,7 +52,8 @@
gui-x: -300
gui-y: -250
kafka:
- charm: "cs:~charmed-osm/kafka-1"
+ charm: osm-kafka
+ channel: latest/edge
scale: 1
series: kubernetes
storage:
@@ -60,7 +62,8 @@
gui-x: 0
gui-y: 250
mongodb:
- charm: ch:mongodb-k8s
+ charm: mongodb-k8s
+ channel: latest/stable
scale: 1
series: kubernetes
storage:
@@ -69,7 +72,8 @@
gui-x: 0
gui-y: 0
nbi:
- charm: "cs:~charmed-osm/nbi-18"
+ charm: osm-nbi
+ channel: latest/edge
scale: 1
series: kubernetes
options:
@@ -80,7 +84,8 @@
gui-x: 0
gui-y: -250
ro:
- charm: "cs:~charmed-osm/ro-10"
+ charm: osm-ro
+ channel: latest/edge
scale: 1
series: kubernetes
options:
@@ -89,14 +94,16 @@
gui-x: -300
gui-y: 250
ng-ui:
- charm: "cs:~charmed-osm/ng-ui-25"
+ charm: osm-ng-ui
+ channel: latest/edge
scale: 1
series: kubernetes
annotations:
gui-x: 600
gui-y: 0
lcm:
- charm: "cs:~charmed-osm/lcm-15"
+ charm: osm-lcm
+ channel: latest/edge
scale: 1
series: kubernetes
options:
@@ -106,7 +113,8 @@
gui-x: -300
gui-y: 0
mon:
- charm: "cs:~charmed-osm/mon-12"
+ charm: osm-mon
+ channel: latest/edge
scale: 1
series: kubernetes
options:
@@ -117,7 +125,8 @@
gui-x: 300
gui-y: 0
pol:
- charm: "cs:~charmed-osm/pol-10"
+ charm: osm-pol
+ channel: latest/edge
scale: 1
series: kubernetes
options:
@@ -126,7 +135,8 @@
gui-x: -300
gui-y: 500
pla:
- charm: "cs:~charmed-osm/pla-13"
+ charm: osm-pla
+ channel: latest/edge
scale: 1
series: kubernetes
options:
@@ -135,7 +145,8 @@
gui-x: 600
gui-y: -250
prometheus:
- charm: "cs:~charmed-osm/prometheus-9"
+ charm: osm-prometheus
+ channel: latest/edge
scale: 1
series: kubernetes
storage:
@@ -146,16 +157,17 @@
gui-x: 300
gui-y: 250
grafana:
- charm: "cs:~charmed-osm/grafana-10"
+ charm: osm-grafana
+ channel: latest/edge
scale: 1
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
annotations:
gui-x: 300
gui-y: -250
@@ -165,7 +177,7 @@
- - kafka:zookeeper
- zookeeper:zookeeper
- - keystone:db
- - mariadb-k8s:mysql
+ - mariadb:mysql
- - lcm:kafka
- kafka:kafka
- - lcm:mongodb
@@ -202,7 +214,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/charmcraft.yaml b/installers/charm/bundles/osm/charmcraft.yaml
new file mode 100644
index 0000000..111b05c
--- /dev/null
+++ b/installers/charm/bundles/osm/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