Release 13 Preparation

Corrected typo: v13 is represented as track 13, not
v13.

Change-Id: I143199199486556ed8afa142a59ab435186d900c
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>

diff --git a/installers/charm/bundles/osm-ha/bundle.yaml b/installers/charm/bundles/osm-ha/bundle.yaml
index 0469c19..8c90e2c 100644 (file)
--- a/installers/charm/bundles/osm-ha/bundle.yaml
+++ b/installers/charm/bundles/osm-ha/bundle.yaml
@@ -62,7 +62,7 @@ applications:
       db: 50M
   nbi:
     charm: osm-nbi
-    channel: v13.0/stable
+    channel: 13.0/stable
     trust: true
     scale: 3
     options:
@@ -72,7 +72,7 @@ applications:
       nbi-image: opensourcemano/nbi:testing-daily
   ro:
     charm: osm-ro
-    channel: v13.0/stable
+    channel: 13.0/stable
     trust: true
     scale: 3
     options:
@@ -81,14 +81,14 @@ applications:
       ro-image: opensourcemano/ro:testing-daily
   ng-ui:
     charm: osm-ng-ui
-    channel: v13.0/stable
+    channel: 13.0/stable
     trust: true
     scale: 3
     resources:
       ng-ui-image: opensourcemano/ng-ui:testing-daily
   lcm:
     charm: osm-lcm
-    channel: v13.0/stable
+    channel: 13.0/stable
     scale: 3
     options:
       database-commonkey: osm
@@ -97,7 +97,7 @@ applications:
       lcm-image: opensourcemano/lcm:testing-daily
   mon:
     charm: osm-mon
-    channel: v13.0/stable
+    channel: 13.0/stable
     trust: true
     scale: 1
     options:
@@ -108,7 +108,7 @@ applications:
       mon-image: opensourcemano/mon:testing-daily
   pol:
     charm: osm-pol
-    channel: v13.0/stable
+    channel: 13.0/stable
     scale: 3
     options:
       log-level: DEBUG
@@ -116,7 +116,7 @@ applications:
       pol-image: opensourcemano/pol:testing-daily
   vca:
     charm: osm-vca-integrator
-    channel: v13.0/stable
+    channel: 13.0/stable
     scale: 1
   ingress:
     charm: nginx-ingress-integrator
@@ -124,7 +124,7 @@ applications:
     scale: 3
   prometheus:
     charm: osm-prometheus
-    channel: latest/stable
+    channel: 13.0/stable
     scale: 1
     series: kubernetes
     storage:
@@ -133,7 +133,7 @@ applications:
       default-target: "mon:8000"
   grafana:
     charm: osm-grafana
-    channel: latest/stable
+    channel: 13.0/stable
     scale: 3
     series: kubernetes
   keystone:

diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml
index c0e5b58..0dbf3b5 100644 (file)
--- a/installers/charm/bundles/osm/bundle.yaml
+++ b/installers/charm/bundles/osm/bundle.yaml
@@ -60,7 +60,7 @@ applications:
       db: 50M
   nbi:
     charm: osm-nbi
-    channel: v13.0/stable
+    channel: 13.0/stable
     trust: true
     scale: 1
     options:
@@ -70,7 +70,7 @@ applications:
       nbi-image: opensourcemano/nbi:testing-daily
   ro:
     charm: osm-ro
-    channel: v13.0/stable
+    channel: 13.0/stable
     trust: true
     scale: 1
     options:
@@ -79,14 +79,14 @@ applications:
       ro-image: opensourcemano/ro:testing-daily
   ng-ui:
     charm: osm-ng-ui
-    channel: v13.0/stable
+    channel: 13.0/stable
     trust: true
     scale: 1
     resources:
       ng-ui-image: opensourcemano/ng-ui:testing-daily
   lcm:
     charm: osm-lcm
-    channel: v13.0/stable
+    channel: 13.0/stable
     scale: 1
     options:
       database-commonkey: osm
@@ -95,7 +95,7 @@ applications:
       lcm-image: opensourcemano/lcm:testing-daily
   mon:
     charm: osm-mon
-    channel: v13.0/stable
+    channel: 13.0/stable
     trust: true
     scale: 1
     options:
@@ -106,7 +106,7 @@ applications:
       mon-image: opensourcemano/mon:testing-daily
   pol:
     charm: osm-pol
-    channel: v13.0/stable
+    channel: 13.0/stable
     scale: 1
     options:
       log-level: DEBUG
@@ -114,7 +114,7 @@ applications:
       pol-image: opensourcemano/pol:testing-daily
   vca:
     charm: osm-vca-integrator
-    channel: v13.0/stable
+    channel: 13.0/stable
     scale: 1
   ingress:
     charm: nginx-ingress-integrator
@@ -122,7 +122,7 @@ applications:
     scale: 1
   prometheus:
     charm: osm-prometheus
-    channel: latest/stable
+    channel: 13.0/stable
     scale: 1
     series: kubernetes
     storage:
@@ -131,7 +131,7 @@ applications:
       default-target: "mon:8000"
   grafana:
     charm: osm-grafana
-    channel: latest/stable
+    channel: 13.0/stable
     scale: 1
     series: kubernetes
   keystone:

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 20c3c9d..a249ae2 100755 (executable)
--- a/installers/charmed_install.sh
+++ b/installers/charmed_install.sh
@@ -44,7 +44,7 @@ MODEL_NAME=osm
 
 OSM_BUNDLE=ch:osm
 OSM_HA_BUNDLE=ch:osm-ha
-CHARMHUB_CHANNEL=v13.0/stable
+CHARMHUB_CHANNEL=13.0/stable
 unset TAG
 
 function check_arguments(){