Update osm bundles to cs:osm-64 and cs:osm-ha-49

Also updated the release script to include the exporters

Change-Id: I354cfa93c1e7ff6af9061e380d443dbd59a5d66a
Signed-off-by: David Garcia <david.garcia@canonical.com>

diff --git a/installers/charm/build.sh b/installers/charm/build.sh
index e7649d0..06a6d65 100755 (executable)
--- a/installers/charm/build.sh
+++ b/installers/charm/build.sh
@@ -17,22 +17,7 @@ function build() {
     cd $1 && tox -e build && cd ..
 }
 
-# reactive_charms=""
-# for charm_directory in $reactive_charms; do
-#     echo "Building charm $charm_directory..."
-#     cd $charm_directory
-#     charmcraft build
-#     cd ..
-# done
-
-# build 'lcm-k8s'
-# build 'mon-k8s'
-# build 'nbi-k8s'
-# build 'pol-k8s'
-# build 'ro-k8s'
-# build 'ui-k8s'
-
-charms="ro nbi pla pol mon lcm ng-ui keystone grafana prometheus keystone mariadb-k8s mongodb-k8s zookeeper-k8s kafka-k8s"
+charms="ro nbi pla pol mon lcm ng-ui keystone grafana prometheus keystone mariadb-k8s mongodb-k8s zookeeper-k8s kafka-k8s mongodb-exporter kafka-exporter mysqld-exporter"
 if [ -z `which charmcraft` ]; then
     sudo snap install charmcraft --edge
 fi

diff --git a/installers/charm/bundles/osm-ha/bundle.yaml b/installers/charm/bundles/osm-ha/bundle.yaml
index d8576e9..f142562 100644 (file)
--- 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-11"
     scale: 3
     series: kubernetes
     options:
@@ -110,7 +110,7 @@ applications:
       gui-x: 600
       gui-y: 0
   lcm:
-    charm: "cs:~charmed-osm/lcm-6"
+    charm: "cs:~charmed-osm/lcm-7"
     scale: 3
     series: kubernetes
     options:

diff --git a/installers/charm/bundles/osm/bundle.yaml b/installers/charm/bundles/osm/bundle.yaml
index 6163e35..2e7896e 100644 (file)
--- 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-11"
     scale: 1
     series: kubernetes
     options:
@@ -103,7 +103,7 @@ applications:
       gui-x: 600
       gui-y: 0
   lcm:
-    charm: "cs:~charmed-osm/lcm-6"
+    charm: "cs:~charmed-osm/lcm-7"
     scale: 1
     series: kubernetes
     options:

diff --git a/installers/charm/release_edge.sh b/installers/charm/release_edge.sh
index 6e8a40c..c59b2d5 100755 (executable)
--- a/installers/charm/release_edge.sh
+++ b/installers/charm/release_edge.sh
@@ -20,14 +20,6 @@ tag=testing-daily
 # 1. Build charms
 ./build.sh
 
-# 2. Release charms
-# Reactive charms
-charms="lcm-k8s mon-k8s pol-k8s ro-k8s"
-for charm in $charms; do
-    cs_revision=`charm push $charm/release cs:~charmed-osm/$charm | tail -n +1 | head -1 | awk '{print $2}'`
-    charm release --channel $channel $cs_revision
-    echo "$charm charm released!"
-done
 
 # New charms (with resources)
 charms="ng-ui nbi pla keystone ro lcm mon pol"
@@ -41,6 +33,17 @@ for charm in $charms; do
     echo "$charm charm released!"
 done
 
+charms="mongodb-exporter kafka-exporter mysqld-exporter"
+for charm in $charms; do
+    echo "Releasing $charm charm"
+    cs_revision=$(charm push $charm/$charm.charm cs:~charmed-osm/$charm | tail -n +1 | head -1 | awk '{print $2}')
+    resource_revision=$(charm attach $cs_revision image=external::bitnami/$charm:latest | tail -n +1 | sed 's/[^0-9]*//g')
+    image_revision_num=$(echo $resource_revision  | awk '{print $NF}')
+    resources_string="--resource image-$image_revision_num"
+    charm release --channel $channel $cs_revision $resources_string
+    echo "$charm charm released!"
+done
+
 charm="prometheus"
 echo "Releasing $charm charm"
 cs_revision=$(charm push $charm/$charm.charm cs:~charmed-osm/$charm | tail -n +1 | head -1 | awk '{print $2}')
@@ -63,7 +66,7 @@ charm release --channel $channel $cs_revision $resources_string
 echo "$charm charm released!"
 
 # 3. Grant permissions
-all_charms="ng-ui nbi pla keystone ro lcm mon pol grafana prometheus"
+all_charms="ng-ui nbi pla keystone ro lcm mon pol grafana prometheus mongodb-exporter kafka-exporter mysqld-exporter"
 for charm in $all_charms; do
     echo "Granting permission for $charm charm"
     charm grant cs:~charmed-osm/$charm --channel $channel --acl read everyone

diff --git a/installers/charmed_install.sh b/installers/charmed_install.sh
index 62fc0e8..8a51708 100755 (executable)
--- 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-64
+OSM_HA_BUNDLE=cs:osm-ha-49
 TAG=testing-daily
 
 function check_arguments(){