From 4eb45c9ac3537883d4f180521afab84dd10f267d Mon Sep 17 00:00:00 2001 From: aticig Date: Thu, 11 Aug 2022 13:10:19 +0300 Subject: [PATCH] Changing charmed installer to use latest/stable OSM bundles are modified to deploy osm charms from latest/stable. Change-Id: I0973cf952b9d54de53c1985e0690d24062e160d6 Signed-off-by: aticig --- installers/charm/bundles/osm-ha/bundle.yaml | 20 ++++++++++---------- installers/charm/bundles/osm/bundle.yaml | 20 ++++++++++---------- installers/charmed_install.sh | 2 +- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/installers/charm/bundles/osm-ha/bundle.yaml b/installers/charm/bundles/osm-ha/bundle.yaml index f20e598a..27af1073 100644 --- a/installers/charm/bundles/osm-ha/bundle.yaml +++ b/installers/charm/bundles/osm-ha/bundle.yaml @@ -74,7 +74,7 @@ applications: gui-y: 0 nbi: charm: osm-nbi - channel: latest/edge + channel: latest/stable scale: 3 series: kubernetes options: @@ -88,7 +88,7 @@ applications: gui-y: -250 ro: charm: osm-ro - channel: latest/edge + channel: latest/stable scale: 3 series: kubernetes options: @@ -100,7 +100,7 @@ applications: gui-y: 250 ng-ui: charm: osm-ng-ui - channel: latest/edge + channel: latest/stable scale: 3 series: kubernetes resources: @@ -110,7 +110,7 @@ applications: gui-y: 0 lcm: charm: osm-lcm - channel: latest/edge + channel: latest/stable scale: 3 series: kubernetes options: @@ -123,7 +123,7 @@ applications: gui-y: 0 mon: charm: osm-mon - channel: latest/edge + channel: latest/stable scale: 1 series: kubernetes options: @@ -137,7 +137,7 @@ applications: gui-y: 0 pol: charm: osm-pol - channel: latest/edge + channel: latest/stable scale: 3 series: kubernetes options: @@ -149,7 +149,7 @@ applications: gui-y: 500 pla: charm: osm-pla - channel: latest/edge + channel: latest/stable scale: 3 series: kubernetes options: @@ -161,7 +161,7 @@ applications: gui-y: -250 prometheus: charm: osm-prometheus - channel: latest/edge + channel: latest/stable scale: 1 series: kubernetes storage: @@ -173,7 +173,7 @@ applications: gui-y: 250 grafana: charm: osm-grafana - channel: latest/edge + channel: latest/stable scale: 3 series: kubernetes annotations: @@ -181,7 +181,7 @@ applications: gui-y: 500 keystone: charm: osm-keystone - channel: latest/edge + channel: latest/stable scale: 1 resources: keystone-image: opensourcemano/keystone:testing-daily diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml index 601e3657..edac6c93 100644 --- a/installers/charm/bundles/osm/bundle.yaml +++ b/installers/charm/bundles/osm/bundle.yaml @@ -72,7 +72,7 @@ applications: gui-y: 0 nbi: charm: osm-nbi - channel: latest/edge + channel: latest/stable scale: 1 series: kubernetes options: @@ -86,7 +86,7 @@ applications: gui-y: -250 ro: charm: osm-ro - channel: latest/edge + channel: latest/stable scale: 1 series: kubernetes options: @@ -98,7 +98,7 @@ applications: gui-y: 250 ng-ui: charm: osm-ng-ui - channel: latest/edge + channel: latest/stable scale: 1 series: kubernetes resources: @@ -108,7 +108,7 @@ applications: gui-y: 0 lcm: charm: osm-lcm - channel: latest/edge + channel: latest/stable scale: 1 series: kubernetes options: @@ -121,7 +121,7 @@ applications: gui-y: 0 mon: charm: osm-mon - channel: latest/edge + channel: latest/stable scale: 1 series: kubernetes options: @@ -135,7 +135,7 @@ applications: gui-y: 0 pol: charm: osm-pol - channel: latest/edge + channel: latest/stable scale: 1 series: kubernetes options: @@ -147,7 +147,7 @@ applications: gui-y: 500 pla: charm: osm-pla - channel: latest/edge + channel: latest/stable scale: 1 series: kubernetes options: @@ -159,7 +159,7 @@ applications: gui-y: -250 prometheus: charm: osm-prometheus - channel: latest/edge + channel: latest/stable scale: 1 series: kubernetes storage: @@ -171,7 +171,7 @@ applications: gui-y: 250 grafana: charm: osm-grafana - channel: latest/edge + channel: latest/stable scale: 1 series: kubernetes annotations: @@ -179,7 +179,7 @@ applications: gui-y: 500 keystone: charm: osm-keystone - channel: latest/edge + channel: latest/stable scale: 1 resources: keystone-image: opensourcemano/keystone:testing-daily diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh index 4cee0a37..527f5a8a 100755 --- a/installers/charmed_install.sh +++ b/installers/charmed_install.sh @@ -41,7 +41,7 @@ MODEL_NAME=osm OSM_BUNDLE=ch:osm OSM_HA_BUNDLE=ch:osm-ha -CHARMHUB_CHANNEL=latest/edge +CHARMHUB_CHANNEL=12.0/stable unset TAG function check_arguments(){ -- 2.25.1