Merge ~hopem/stsstack-bundles:default-to-focal into stsstack-bundles:master

[Edward Hope-Morley]

Unmerged commits

e64300e... by Edward Hope-Morley on 2020-10-06

Set default series to Focal

diff --git a/common/helpers b/common/helpers
index 72d8f2a..1f4882e 100644
--- a/common/helpers
+++ b/common/helpers
@@ -9,7 +9,7 @@ declare -A MASTER_OPTS=(
     [VIP_ADDR_START]=10.5.100.0
     [CHARM_REVISIONS]=
 )
-DEFAULT_SERIES=bionic
+DEFAULT_SERIES=focal
 JUJU_VERSION="`juju show-controller| sed -r 's/.+controller-model-version:\s+(.+)/\1/g;t;d' 2>/dev/null`" || true
 [ -n "$JUJU_VERSION" ] || JUJU_VERSION="`juju --version 2>/dev/null| sed -r 's/^([[:digit:]\.]+).*/\1/g'`"
 JUJU_DEPLOY_OPTS=""
diff --git a/openstack/profiles/default b/openstack/profiles/default
index 7d9c658..bc2273f 100755
--- a/openstack/profiles/default
+++ b/openstack/profiles/default
@@ -54,28 +54,36 @@ else
   create_tempest_users
 fi
 
+set_img_properties ()
+{
+    img_name=$1
+    img_version=$2
+    img_file=$3
+
+    ts=`stat ~/images/$img_file| sed -rn 's/Modify:\s+([[:digit:]-]+)\s+.+/\1/p'| tr -d '-'`
+    declare -A props=( [architecture]=x86_64
+                       [os_distro]='ubuntu'
+                       [os_version]=$img_version
+                       [version_name]="$ts"
+                       [product_name]="com.ubuntu.cloud:server:${img_version}:amd64"
+    )
+    for p in ${!props[@]}; do 
+      openstack image set --property $p=${props[$p]} $img_name &
+    done
+    wait
+}
+
 # Download images if not already present
 mkdir -vp ~/images
 upload_image cloudimages bionic bionic-server-cloudimg-amd64.img &
+upload_image cloudimages focal focal-server-cloudimg-amd64.img &
+# Set properties needed by octavia-disk-image-retrofit (See LP: #1842430)
+set_img_properties bionic 18.04 bionic-server-cloudimg-amd64.img &
+set_img_properties focal 20.04 focal-server-cloudimg-amd64.img &
 upload_image swift cirros cirros-0.4.0-x86_64-disk.img &
 upload_image swift cirros2 cirros-0.3.5-x86_64-disk.img &
 wait
 
-# Set properties needed by octavia-disk-image-retrofit (See LP: #1842430) - we only do Bionic for now since that's the only one supported.
-img_file=bionic-server-cloudimg-amd64.img
-img_name=bionic
-ts=`stat ~/images/$img_file| sed -r 's/Modify:\s+([[:digit:]-]+)\s+.+/\1/g;t;d'| tr -d '-'`
-declare -A props=( [architecture]=x86_64
-                   [os_distro]='ubuntu'
-                   [os_version]='18.04'
-                   [version_name]="$ts"
-                   [product_name]="com.ubuntu.cloud:server:18.04:amd64"
-)
-for p in ${!props[@]}; do 
-  openstack image set --property $p=${props[$p]} $img_name &
-done
-wait
-
 # TODO: remove fallbacks once we move to queens (they are there for clients still on ocata)
 image_id=$(openstack image list --name cirros -f value -c ID 2>/dev/null || openstack image list| awk '$4=="cirros" {print $2}')
 image_alt_id=$(openstack image list --name cirros2 -f value -c ID 2>/dev/null || openstack image list| awk '$4=="cirros2" {print $2}')
diff --git a/overlays/glance-simplestreams-sync.yaml b/overlays/glance-simplestreams-sync.yaml
index d5bc432..8c8fd06 100644
--- a/overlays/glance-simplestreams-sync.yaml
+++ b/overlays/glance-simplestreams-sync.yaml
@@ -11,7 +11,7 @@ applications:
          [{url: 'http://cloud-images.ubuntu.com/daily/',
           name_prefix: 'ubuntu:daily',
           path: 'streams/v1/index.sjson', max: 1,
-          item_filters: ['release~(bionic)',
+          item_filters: ['release~(focal)',
                          'arch~(x86_64|amd64)',
                          'ftype~(disk1.img|disk.img)']}]
       use_swift: __GSSS_SWIFT_ENABLED__
diff --git a/tools/vault-unseal-and-authorise.sh b/tools/vault-unseal-and-authorise.sh
index dda449b..1de1391 100755
--- a/tools/vault-unseal-and-authorise.sh
+++ b/tools/vault-unseal-and-authorise.sh
@@ -8,7 +8,7 @@ unseal_output=~/unseal_output.$model
 
 ftmp=`mktemp`
 juju status --format=json vault > $ftmp
-readarray -t addrs<<<"`jq -r '.applications[].units[]."public-address"' $ftmp 2>/dev/null`"
+readarray -t addrs<<<"`jq -r '.applications[].units[]?."public-address"' $ftmp 2>/dev/null`"
 leader="`jq -r '.applications[].units | to_entries[] | select(.value.leader==true) | .key' $ftmp 2>/dev/null`"
 leader_addr="`jq -r '.applications[].units | to_entries[] | select(.value.leader==true) | .value."public-address"' $ftmp 2>/dev/null`"
 rm $ftmp