From: David Garcia Date: Thu, 10 Jun 2021 10:29:52 +0000 (+0200) Subject: Update osm bundles to cs:osm-66 and cs:osm-ha-51 X-Git-Tag: v10.0.1~7 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=0693b09ef23d974ad95ef62cdd6000b47c1cd133;p=osm%2Fdevops.git Update osm bundles to cs:osm-66 and cs:osm-ha-51 Change-Id: Ie0b411d15c8b727fda2603ab0576ee46d80cb54d Signed-off-by: David Garcia --- diff --git a/installers/charm/bundles/osm-ha/bundle.yaml b/installers/charm/bundles/osm-ha/bundle.yaml index d8576e91..f48bae2a 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-9" + charm: "cs:~charmed-osm/nbi-12" scale: 3 series: kubernetes options: @@ -103,14 +103,14 @@ applications: gui-x: -300 gui-y: 250 ng-ui: - charm: "cs:~charmed-osm/ng-ui-20" + charm: "cs:~charmed-osm/ng-ui-21" scale: 3 series: kubernetes annotations: gui-x: 600 gui-y: 0 lcm: - charm: "cs:~charmed-osm/lcm-6" + charm: "cs:~charmed-osm/lcm-8" scale: 3 series: kubernetes options: @@ -149,7 +149,7 @@ applications: gui-x: 600 gui-y: -250 prometheus: - charm: "cs:~charmed-osm/prometheus-3" + charm: "cs:~charmed-osm/prometheus-4" scale: 1 series: kubernetes storage: @@ -160,14 +160,14 @@ applications: gui-x: 300 gui-y: 250 grafana: - charm: "cs:~charmed-osm/grafana-3" + charm: "cs:~charmed-osm/grafana-4" scale: 3 series: kubernetes annotations: gui-x: 300 gui-y: 500 keystone: - charm: "cs:~charmed-osm/keystone-8" + charm: "cs:~charmed-osm/keystone-9" scale: 1 series: kubernetes annotations: diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml index 6163e35f..c6ba49e1 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-9" + charm: "cs:~charmed-osm/nbi-12" scale: 1 series: kubernetes options: @@ -96,14 +96,14 @@ applications: gui-x: -300 gui-y: 250 ng-ui: - charm: "cs:~charmed-osm/ng-ui-20" + charm: "cs:~charmed-osm/ng-ui-21" scale: 1 series: kubernetes annotations: gui-x: 600 gui-y: 0 lcm: - charm: "cs:~charmed-osm/lcm-6" + charm: "cs:~charmed-osm/lcm-8" scale: 1 series: kubernetes options: @@ -142,7 +142,7 @@ applications: gui-x: 600 gui-y: -250 prometheus: - charm: "cs:~charmed-osm/prometheus-3" + charm: "cs:~charmed-osm/prometheus-4" scale: 1 series: kubernetes storage: @@ -153,14 +153,14 @@ applications: gui-x: 300 gui-y: 250 grafana: - charm: "cs:~charmed-osm/grafana-3" + charm: "cs:~charmed-osm/grafana-4" scale: 1 series: kubernetes annotations: gui-x: 300 gui-y: 500 keystone: - charm: "cs:~charmed-osm/keystone-8" + charm: "cs:~charmed-osm/keystone-9" scale: 1 series: kubernetes annotations: diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh index 62fc0e8d..a011ef1a 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-63 -OSM_HA_BUNDLE=cs:osm-ha-48 +OSM_BUNDLE=cs:osm-66 +OSM_HA_BUNDLE=cs:osm-ha-51 TAG=testing-daily function check_arguments(){