From: David Garcia <david.garcia@canonical.com>
Date: Fri, 14 May 2021 15:42:27 +0000 (+0200)
Subject: Update OSM bundles to cs:osm-63 and cs:osm-ha-48
X-Git-Tag: release-v10.0-start~3
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=173adad368787dab2a2a4a2da9f8971243328ca7;hp=c1f54a83696c22df1a8969ba87643e720891a7c8;p=osm%2Fdevops.git

Update OSM bundles to cs:osm-63 and cs:osm-ha-48

Change-Id: Iad1ae3ff60b767877c585a4f5757053064f7a83c
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 b1804b85..d8576e91 100644
--- a/installers/charm/bundles/osm-ha/bundle.yaml
+++ b/installers/charm/bundles/osm-ha/bundle.yaml
@@ -83,7 +83,7 @@ applications:
       gui-x: 0
       gui-y: 0
   nbi:
-    charm: "cs:~charmed-osm/nbi-8"
+    charm: "cs:~charmed-osm/nbi-9"
     scale: 3
     series: kubernetes
     options:
@@ -94,7 +94,7 @@ applications:
       gui-x: 0
       gui-y: -250
   ro:
-    charm: "cs:~charmed-osm/ro-3"
+    charm: "cs:~charmed-osm/ro-4"
     scale: 3
     series: kubernetes
     options:
@@ -103,14 +103,14 @@ applications:
       gui-x: -300
       gui-y: 250
   ng-ui:
-    charm: "cs:~charmed-osm/ng-ui-19"
+    charm: "cs:~charmed-osm/ng-ui-20"
     scale: 3
     series: kubernetes
     annotations:
       gui-x: 600
       gui-y: 0
   lcm:
-    charm: "cs:~charmed-osm/lcm-5"
+    charm: "cs:~charmed-osm/lcm-6"
     scale: 3
     series: kubernetes
     options:
@@ -120,7 +120,7 @@ applications:
       gui-x: -300
       gui-y: 0
   mon:
-    charm: "cs:~charmed-osm/mon-4"
+    charm: "cs:~charmed-osm/mon-5"
     scale: 1
     series: kubernetes
     options:
@@ -131,7 +131,7 @@ applications:
       gui-x: 300
       gui-y: 0
   pol:
-    charm: "cs:~charmed-osm/pol-3"
+    charm: "cs:~charmed-osm/pol-4"
     scale: 3
     series: kubernetes
     options:
@@ -140,7 +140,7 @@ applications:
       gui-x: -300
       gui-y: 500
   pla:
-    charm: "cs:~charmed-osm/pla-8"
+    charm: "cs:~charmed-osm/pla-9"
     scale: 3
     series: kubernetes
     options:
@@ -149,7 +149,7 @@ applications:
       gui-x: 600
       gui-y: -250
   prometheus:
-    charm: "cs:~charmed-osm/prometheus-2"
+    charm: "cs:~charmed-osm/prometheus-3"
     scale: 1
     series: kubernetes
     storage:
@@ -160,14 +160,14 @@ applications:
       gui-x: 300
       gui-y: 250
   grafana:
-    charm: "cs:~charmed-osm/grafana-2"
+    charm: "cs:~charmed-osm/grafana-3"
     scale: 3
     series: kubernetes
     annotations:
       gui-x: 300
       gui-y: 500
   keystone:
-    charm: "cs:~charmed-osm/keystone-7"
+    charm: "cs:~charmed-osm/keystone-8"
     scale: 1
     series: kubernetes
     annotations:
diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml
index bc0c4006..6163e35f 100644
--- a/installers/charm/bundles/osm/bundle.yaml
+++ b/installers/charm/bundles/osm/bundle.yaml
@@ -76,7 +76,7 @@ applications:
       gui-x: 0
       gui-y: 0
   nbi:
-    charm: "cs:~charmed-osm/nbi-8"
+    charm: "cs:~charmed-osm/nbi-9"
     scale: 1
     series: kubernetes
     options:
@@ -87,7 +87,7 @@ applications:
       gui-x: 0
       gui-y: -250
   ro:
-    charm: "cs:~charmed-osm/ro-3"
+    charm: "cs:~charmed-osm/ro-4"
     scale: 1
     series: kubernetes
     options:
@@ -96,14 +96,14 @@ applications:
       gui-x: -300
       gui-y: 250
   ng-ui:
-    charm: "cs:~charmed-osm/ng-ui-19"
+    charm: "cs:~charmed-osm/ng-ui-20"
     scale: 1
     series: kubernetes
     annotations:
       gui-x: 600
       gui-y: 0
   lcm:
-    charm: "cs:~charmed-osm/lcm-5"
+    charm: "cs:~charmed-osm/lcm-6"
     scale: 1
     series: kubernetes
     options:
@@ -113,7 +113,7 @@ applications:
       gui-x: -300
       gui-y: 0
   mon:
-    charm: "cs:~charmed-osm/mon-4"
+    charm: "cs:~charmed-osm/mon-5"
     scale: 1
     series: kubernetes
     options:
@@ -124,7 +124,7 @@ applications:
       gui-x: 300
       gui-y: 0
   pol:
-    charm: "cs:~charmed-osm/pol-3"
+    charm: "cs:~charmed-osm/pol-4"
     scale: 1
     series: kubernetes
     options:
@@ -133,7 +133,7 @@ applications:
       gui-x: -300
       gui-y: 500
   pla:
-    charm: "cs:~charmed-osm/pla-8"
+    charm: "cs:~charmed-osm/pla-9"
     scale: 1
     series: kubernetes
     options:
@@ -142,7 +142,7 @@ applications:
       gui-x: 600
       gui-y: -250
   prometheus:
-    charm: "cs:~charmed-osm/prometheus-2"
+    charm: "cs:~charmed-osm/prometheus-3"
     scale: 1
     series: kubernetes
     storage:
@@ -153,14 +153,14 @@ applications:
       gui-x: 300
       gui-y: 250
   grafana:
-    charm: "cs:~charmed-osm/grafana-2"
+    charm: "cs:~charmed-osm/grafana-3"
     scale: 1
     series: kubernetes
     annotations:
       gui-x: 300
       gui-y: 500
   keystone:
-    charm: "cs:~charmed-osm/keystone-7"
+    charm: "cs:~charmed-osm/keystone-8"
     scale: 1
     series: kubernetes
     annotations:
diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index d77e8467..62fc0e8d 100755
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -25,8 +25,8 @@ PATH=/snap/bin:${PATH}
 
 MODEL_NAME=osm
 
-OSM_BUNDLE=cs:osm-62
-OSM_HA_BUNDLE=cs:osm-ha-47
+OSM_BUNDLE=cs:osm-63
+OSM_HA_BUNDLE=cs:osm-ha-48
 TAG=testing-daily
 
 function check_arguments(){