Charmed OSM preparation for 10.1.0

- Update images in bundles
- Use juju 2.9.25
- Use candidate charms

Change-Id: Ic722d9fcf863ac200170e896c4ba8ca3b350fb7f
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 9d3f312..9d28fe5 100644 (file)
--- a/installers/charm/bundles/osm-ha/bundle.yaml
+++ b/installers/charm/bundles/osm-ha/bundle.yaml
@@ -31,23 +31,17 @@ description: |
 applications:
   zookeeper:
     charm: zookeeper-k8s
-    channel: latest/edge
+    channel: latest/stable
     scale: 3
     storage:
       data: 100M
-    annotations:
-      gui-x: 0
-      gui-y: 500
   kafka:
     charm: kafka-k8s
-    channel: latest/edge
+    channel: latest/stable
     scale: 3
     trust: true
     storage:
       data: 100M
-    annotations:
-      gui-x: 0
-      gui-y: 250
   mariadb:
     charm: charmed-osm-mariadb-k8s
     scale: 3
@@ -59,9 +53,6 @@ applications:
       root_password: osm4u
       user: mano
       ha-mode: true
-    annotations:
-      gui-x: -300
-      gui-y: -250
   mongodb:
     charm: mongodb-k8s
     channel: latest/stable
@@ -69,12 +60,9 @@ applications:
     series: kubernetes
     storage:
       db: 50M
-    annotations:
-      gui-x: 0
-      gui-y: 0
   nbi:
     charm: osm-nbi
-    channel: latest/edge
+    channel: latest/candidate
     scale: 3
     series: kubernetes
     options:
@@ -82,48 +70,36 @@ applications:
       auth_backend: keystone
       log_level: DEBUG
     resources:
-      image: opensourcemano/nbi:10.0.3
-    annotations:
-      gui-x: 0
-      gui-y: -250
+      image: opensourcemano/nbi:10
   ro:
     charm: osm-ro
-    channel: latest/edge
+    channel: latest/candidate
     scale: 3
     series: kubernetes
     options:
       log_level: DEBUG
     resources:
-      image: opensourcemano/ro:10.0.3
-    annotations:
-      gui-x: -300
-      gui-y: 250
+      image: opensourcemano/ro:10
   ng-ui:
     charm: osm-ng-ui
-    channel: latest/edge
+    channel: latest/candidate
     scale: 3
     series: kubernetes
     resources:
-      image: opensourcemano/ng-ui:10.0.3
-    annotations:
-      gui-x: 600
-      gui-y: 0
+      image: opensourcemano/ng-ui:10
   lcm:
     charm: osm-lcm
-    channel: latest/edge
+    channel: latest/candidate
     scale: 3
     series: kubernetes
     options:
       database_commonkey: osm
       log_level: DEBUG
     resources:
-      image: opensourcemano/lcm:10.0.3
-    annotations:
-      gui-x: -300
-      gui-y: 0
+      image: opensourcemano/lcm:10
   mon:
     charm: osm-mon
-    channel: latest/edge
+    channel: latest/candidate
     scale: 1
     series: kubernetes
     options:
@@ -131,63 +107,45 @@ applications:
       log_level: DEBUG
       keystone_enabled: true
     resources:
-      image: opensourcemano/mon:10.0.3
-    annotations:
-      gui-x: 300
-      gui-y: 0
+      image: opensourcemano/mon:10
   pol:
     charm: osm-pol
-    channel: latest/edge
+    channel: latest/candidate
     scale: 3
     series: kubernetes
     options:
       log_level: DEBUG
     resources:
-      image: opensourcemano/pol:10.0.3
-    annotations:
-      gui-x: -300
-      gui-y: 500
+      image: opensourcemano/pol:10
   pla:
     charm: osm-pla
-    channel: latest/edge
+    channel: latest/candidate
     scale: 3
     series: kubernetes
     options:
       log_level: DEBUG
     resources:
-      image: opensourcemano/pla:10.0.3
-    annotations:
-      gui-x: 600
-      gui-y: -250
+      image: opensourcemano/pla:10
   prometheus:
     charm: osm-prometheus
-    channel: latest/edge
+    channel: latest/candidate
     scale: 1
     series: kubernetes
     storage:
       data: 50M
     options:
       default-target: "mon:8000"
-    annotations:
-      gui-x: 300
-      gui-y: 250
   grafana:
     charm: osm-grafana
-    channel: latest/edge
+    channel: latest/candidate
     scale: 3
     series: kubernetes
-    annotations:
-      gui-x: 300
-      gui-y: 500
   keystone:
     charm: osm-keystone
-    channel: latest/edge
+    channel: latest/candidate
     scale: 1
     resources:
-      keystone-image: opensourcemano/keystone:releaseten-daily
-    annotations:
-      gui-x: 300
-      gui-y: -250
+      keystone-image: opensourcemano/keystone:10
 relations:
   - - grafana:prometheus
     - prometheus:prometheus

diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml
index 548ecd2..c280e29 100644 (file)
--- a/installers/charm/bundles/osm/bundle.yaml
+++ b/installers/charm/bundles/osm/bundle.yaml
@@ -30,23 +30,17 @@ description: |
 applications:
   zookeeper:
     charm: zookeeper-k8s
-    channel: latest/edge
+    channel: latest/stable
     scale: 1
     storage:
       data: 100M
-    annotations:
-      gui-x: 0
-      gui-y: 500
   kafka:
     charm: kafka-k8s
-    channel: latest/edge
+    channel: latest/stable
     scale: 1
     trust: true
     storage:
       data: 100M
-    annotations:
-      gui-x: 0
-      gui-y: 250
   mariadb:
     charm: charmed-osm-mariadb-k8s
     scale: 1
@@ -57,9 +51,6 @@ applications:
       password: manopw
       root_password: osm4u
       user: mano
-    annotations:
-      gui-x: -300
-      gui-y: -250
   mongodb:
     charm: mongodb-k8s
     channel: latest/stable
@@ -67,12 +58,9 @@ applications:
     series: kubernetes
     storage:
       db: 50M
-    annotations:
-      gui-x: 0
-      gui-y: 0
   nbi:
     charm: osm-nbi
-    channel: latest/edge
+    channel: latest/candidate
     scale: 1
     series: kubernetes
     options:
@@ -80,48 +68,36 @@ applications:
       auth_backend: keystone
       log_level: DEBUG
     resources:
-      image: opensourcemano/nbi:10.0.3
-    annotations:
-      gui-x: 0
-      gui-y: -250
+      image: opensourcemano/nbi:10
   ro:
     charm: osm-ro
-    channel: latest/edge
+    channel: latest/candidate
     scale: 1
     series: kubernetes
     options:
       log_level: DEBUG
     resources:
-      image: opensourcemano/ro:10.0.3
-    annotations:
-      gui-x: -300
-      gui-y: 250
+      image: opensourcemano/ro:10
   ng-ui:
     charm: osm-ng-ui
-    channel: latest/edge
+    channel: latest/candidate
     scale: 1
     series: kubernetes
     resources:
-      image: opensourcemano/ng-ui:10.0.3
-    annotations:
-      gui-x: 600
-      gui-y: 0
+      image: opensourcemano/ng-ui:10
   lcm:
     charm: osm-lcm
-    channel: latest/edge
+    channel: latest/candidate
     scale: 1
     series: kubernetes
     options:
       database_commonkey: osm
       log_level: DEBUG
     resources:
-      image: opensourcemano/lcm:10.0.3
-    annotations:
-      gui-x: -300
-      gui-y: 0
+      image: opensourcemano/lcm:10
   mon:
     charm: osm-mon
-    channel: latest/edge
+    channel: latest/candidate
     scale: 1
     series: kubernetes
     options:
@@ -129,63 +105,45 @@ applications:
       log_level: DEBUG
       keystone_enabled: true
     resources:
-      image: opensourcemano/mon:10.0.3
-    annotations:
-      gui-x: 300
-      gui-y: 0
+      image: opensourcemano/mon:10
   pol:
     charm: osm-pol
-    channel: latest/edge
+    channel: latest/candidate
     scale: 1
     series: kubernetes
     options:
       log_level: DEBUG
     resources:
-      image: opensourcemano/pol:10.0.3
-    annotations:
-      gui-x: -300
-      gui-y: 500
+      image: opensourcemano/pol:10
   pla:
     charm: osm-pla
-    channel: latest/edge
+    channel: latest/candidate
     scale: 1
     series: kubernetes
     options:
       log_level: DEBUG
     resources:
-      image: opensourcemano/pla:10.0.3
-    annotations:
-      gui-x: 600
-      gui-y: -250
+      image: opensourcemano/pla:10
   prometheus:
     charm: osm-prometheus
-    channel: latest/edge
+    channel: latest/candidate
     scale: 1
     series: kubernetes
     storage:
       data: 50M
     options:
       default-target: "mon:8000"
-    annotations:
-      gui-x: 300
-      gui-y: 250
   grafana:
     charm: osm-grafana
-    channel: latest/edge
+    channel: latest/candidate
     scale: 1
     series: kubernetes
-    annotations:
-      gui-x: 300
-      gui-y: 500
   keystone:
     charm: osm-keystone
-    channel: latest/edge
+    channel: latest/candidate
     scale: 1
     resources:
-      keystone-image: opensourcemano/keystone:releaseten-daily
-    annotations:
-      gui-x: 300
-      gui-y: -250
+      keystone-image: opensourcemano/keystone:10
 relations:
   - - grafana:prometheus
     - prometheus:prometheus

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 7bec50e..6d7d4be 100755 (executable)
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -17,7 +17,7 @@
 
 LXD_VERSION=4.0
 JUJU_VERSION=2.9
-JUJU_AGENT_VERSION=2.9.22
+JUJU_AGENT_VERSION=2.9.25
 K8S_CLOUD_NAME="k8s-cloud"
 KUBECTL="microk8s.kubectl"
 MICROK8S_VERSION=1.23
@@ -30,7 +30,7 @@ MODEL_NAME=osm
 
 OSM_BUNDLE=ch:osm
 OSM_HA_BUNDLE=ch:osm-ha
-CHARMHUB_CHANNEL=10.0/edge
+CHARMHUB_CHANNEL=10.0/candidate
 unset TAG
 
 function check_arguments(){

diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index e52ecb0..c7e9119 100755 (executable)
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -1635,7 +1635,7 @@ function parse_docker_registry_url() {
 
 LXD_VERSION=4.0
 JUJU_VERSION=2.9
-JUJU_AGENT_VERSION=2.9.22
+JUJU_AGENT_VERSION=2.9.25
 UNINSTALL=""
 DEVELOP=""
 UPDATE=""