Feature 10884: Juju 2.9 support
OSM LTS Support
- Update osm bundles (charmed)
- Update Juju version (snap and agent version) (charmed and k8s)
- Update to new mongodb charm (charmed and k8s)
- Fix ingress issue by adding an ingress_class config
- Charmed installer: point to local bundles until all charms are in
CharmHub
Change-Id: I6ff8328e5db6719bbf9d5d4c9b5490f478b2ace8
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 f48bae2..0909160 100644
--- a/installers/charm/bundles/osm-ha/bundle.yaml
+++ b/installers/charm/bundles/osm-ha/bundle.yaml
@@ -68,22 +68,17 @@
annotations:
gui-x: 0
gui-y: 250
- mongodb-k8s:
- charm: "cs:~charmed-osm/mongodb-k8s"
- channel: "stable"
+ mongodb:
+ charm: ch:mongodb-k8s
scale: 3
series: kubernetes
storage:
- database: 50M
- options:
- replica-set: rs0
- namespace: osm
- enable-sidecar: true
+ db: 50M
annotations:
gui-x: 0
gui-y: 0
nbi:
- charm: "cs:~charmed-osm/nbi-12"
+ charm: "cs:~charmed-osm/nbi-13"
scale: 3
series: kubernetes
options:
@@ -94,7 +89,7 @@
gui-x: 0
gui-y: -250
ro:
- charm: "cs:~charmed-osm/ro-4"
+ charm: "cs:~charmed-osm/ro-5"
scale: 3
series: kubernetes
options:
@@ -103,14 +98,14 @@
gui-x: -300
gui-y: 250
ng-ui:
- charm: "cs:~charmed-osm/ng-ui-21"
+ charm: "cs:~charmed-osm/ng-ui-22"
scale: 3
series: kubernetes
annotations:
gui-x: 600
gui-y: 0
lcm:
- charm: "cs:~charmed-osm/lcm-8"
+ charm: "cs:~charmed-osm/lcm-9"
scale: 3
series: kubernetes
options:
@@ -120,7 +115,7 @@
gui-x: -300
gui-y: 0
mon:
- charm: "cs:~charmed-osm/mon-5"
+ charm: "cs:~charmed-osm/mon-6"
scale: 1
series: kubernetes
options:
@@ -131,7 +126,7 @@
gui-x: 300
gui-y: 0
pol:
- charm: "cs:~charmed-osm/pol-4"
+ charm: "cs:~charmed-osm/pol-5"
scale: 3
series: kubernetes
options:
@@ -140,7 +135,7 @@
gui-x: -300
gui-y: 500
pla:
- charm: "cs:~charmed-osm/pla-9"
+ charm: "cs:~charmed-osm/pla-10"
scale: 3
series: kubernetes
options:
@@ -149,7 +144,7 @@
gui-x: 600
gui-y: -250
prometheus:
- charm: "cs:~charmed-osm/prometheus-4"
+ charm: "cs:~charmed-osm/prometheus-5"
scale: 1
series: kubernetes
storage:
@@ -160,14 +155,14 @@
gui-x: 300
gui-y: 250
grafana:
- charm: "cs:~charmed-osm/grafana-4"
+ charm: "cs:~charmed-osm/grafana-5"
scale: 3
series: kubernetes
annotations:
gui-x: 300
gui-y: 500
keystone:
- charm: "cs:~charmed-osm/keystone-9"
+ charm: "cs:~charmed-osm/keystone-11"
scale: 1
series: kubernetes
annotations:
@@ -183,27 +178,27 @@
- - lcm:kafka
- kafka-k8s:kafka
- - lcm:mongodb
- - mongodb-k8s:mongo
+ - mongodb:database
- - ro:ro
- lcm:ro
- - ro:kafka
- kafka-k8s:kafka
- - ro:mongodb
- - mongodb-k8s:mongo
+ - mongodb:database
- - pol:kafka
- kafka-k8s:kafka
- - pol:mongodb
- - mongodb-k8s:mongo
+ - mongodb:database
- - mon:mongodb
- - mongodb-k8s:mongo
+ - mongodb:database
- - mon:kafka
- kafka-k8s:kafka
- - pla:kafka
- kafka-k8s:kafka
- - pla:mongodb
- - mongodb-k8s:mongo
+ - mongodb:database
- - nbi:mongodb
- - mongodb-k8s:mongo
+ - mongodb:database
- - nbi:kafka
- kafka-k8s:kafka
- - nbi:prometheus