Merge ~freyes/stsstack-bundles:add-magnum into stsstack-bundles:master

[Felipe Reyes]

[Edward Hope-Morley (hopem)]

aiui we no longer intend to support magnum so ill close this. if we want to add it in the future it will need to be targeted at github.com/canonical/stsstack-bundles/

Unmerged commits

40af299... by Felipe Reyes on 2021-06-02

Add magnum overlay.

Magnum offers container orchestration, it allows tenants to deploy
Kubernetes, Docker Swarm and Apache Mesos. It was released as tech
preview as part of the 21.04 charms release.

diff --git a/openstack/pipeline/02configure b/openstack/pipeline/02configure
index f9a8cb8..71979bb 100644
--- a/openstack/pipeline/02configure
+++ b/openstack/pipeline/02configure
@@ -268,6 +268,20 @@ do
             fi
             MOD_MSGS[keystone-saml.0]="run ./tools/enable_samltestid.sh"
             ;;
+        --magnum)
+            assert_min_release ussuri "magnum"
+            MOD_OVERLAYS+=( "magnum.yaml" )
+            set -- $@ --barbican && cache $@
+            set -- $@ --heat && cache $@
+            ;;
+        --magnum-ha)
+            assert_min_release ussuri "magnum-ha"
+            get_units $1 __NUM_MAGNUM_UNITS__ 3
+            MOD_OVERLAYS+=( "magnum-ha.yaml" )
+            set -- $@ --magnum && cache $@
+            set -- $@ --barbican-ha && cache $@
+            set -- $@ --heat-ha && cache $@
+            ;;
         --manila)
             assert_min_release rocky "manila"
             MOD_OVERLAYS+=( "manila.yaml" )
diff --git a/openstack/profiles/common b/openstack/profiles/common
index 95486ec..9e87cc0 100644
--- a/openstack/profiles/common
+++ b/openstack/profiles/common
@@ -8,14 +8,19 @@ function upload_image {
     image_arch=${5:-"x86_64"}
 
     case "$src" in
-        swift) http_root="http://$SWIFT_IP:80/swift/v1/images";;
-        cloudimages) http_root="http://cloud-images.ubuntu.com/${image_name}/current";;
+        swift) http_location="http://$SWIFT_IP:80/swift/v1/images/${image_file}";;
+        cloudimages) http_location="http://cloud-images.ubuntu.com/${image_name}/current/${image_file}";;
+        fedora-coreos) http_location=$(curl https://builds.coreos.fedoraproject.org/streams/stable.json | jq -r '.architectures|.x86_64|.artifacts|.openstack|.formats|."qcow2.xz"|.disk|.location');;
     esac
 
     mkdir -vp ~/images
 
     [ -f ~/images/$image_file ] || {
-        wget -O ~/images/$image_file ${http_root}/${image_file}
+        wget -O ~/images/$image_file ${http_location}
+        if [ "${http_location##*.}" == "xz" ]; then
+            mv ~/images/$image_file ~/images/$image_file.xz
+            unxz ~/images/$image_file.xz
+        fi
     }
 
     # Downloaded images are in qcow2 format already, so we
diff --git a/openstack/profiles/default b/openstack/profiles/default
index a67e289..1cf5676 100755
--- a/openstack/profiles/default
+++ b/openstack/profiles/default
@@ -48,6 +48,10 @@ if ((`juju status ceilometer --format=json 2>/dev/null| jq '.machines| length'`)
     juju run-action --wait ceilometer/leader ceilometer-upgrade
 fi
 
+if ((`juju status magnum --format=json 2>/dev/null| jq '.machines| length'`)); then
+    juju run-action --wait magnum/leader domain-setup
+fi
+
 # Configure neutron networking on overcloud
 source novarc
 
@@ -76,7 +80,7 @@ set_img_properties ()
                        [version_name]="$ts"
                        [product_name]="com.ubuntu.cloud:server:${img_version}:amd64"
     )
-    for p in ${!props[@]}; do 
+    for p in ${!props[@]}; do
       openstack image set --property $p=${props[$p]} $img_name &
     done
     wait
@@ -86,12 +90,23 @@ set_img_properties ()
 mkdir -vp ~/images
 upload_image cloudimages bionic bionic-server-cloudimg-amd64.img &
 upload_image cloudimages focal focal-server-cloudimg-amd64.img &
+
+# magnum uses fedora-coreos to launch k8s clusters, at the moment the ubuntu
+# image is used for Apache Mesos
+# https://docs.openstack.org/magnum/latest/user/#clustertemplate
+if ((`juju status magnum --format=json 2>/dev/null| jq '.machines| length'`)); then
+    upload_image fedora-coreos fedora-coreos-latest fedora-coreos-latest-x86_64.img &
+fi
+
 ${BARE_METAL:-false} || upload_image swift cirros cirros-0.4.0-x86_64-disk.img &
 ${BARE_METAL:-false} || upload_image swift cirros2 cirros-0.3.5-x86_64-disk.img &
 wait
 # 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 &
+if ((`juju status magnum --format=json 2>/dev/null| jq '.machines| length'`)); then
+    openstack image set --property os_distro=fedora-coreos fedora-coreos-latest &
+fi
 wait
 
 # TODO: remove fallbacks once we move to queens (they are there for clients still on ocata)
diff --git a/openstack/tools/create_magnum_k8s.sh b/openstack/tools/create_magnum_k8s.sh
new file mode 100644
index 0000000..d2229a0
--- /dev/null
+++ b/openstack/tools/create_magnum_k8s.sh
@@ -0,0 +1,16 @@
+#!/bin/bash -eux
+
+openstack coe cluster template create k8s-cluster-template \
+          --image fedora-coreos-latest \
+          --keypair testkey \
+          --external-network ext_net \
+          --dns-nameserver 8.8.8.8 \
+          --flavor m1.small \
+          --docker-volume-size 5 \
+          --network-driver flannel \
+          --coe kubernetes
+
+openstack coe cluster create k8s-cluster \
+          --cluster-template k8s-cluster-template \
+          --master-count 1 \
+          --node-count 2
diff --git a/overlays/barbican.yaml b/overlays/barbican.yaml
index 561b33a..24ecca9 100644
--- a/overlays/barbican.yaml
+++ b/overlays/barbican.yaml
@@ -6,7 +6,7 @@ openstack_origin:           &openstack_origin          __OS_ORIGIN__
 applications:
   barbican:
     charm: cs:~openstack-charmers-next/barbican
-    num_units: __NUM_BARBICAN_UNITS__ 
+    num_units: __NUM_BARBICAN_UNITS__
     constraints: mem=1G
     options:
       debug: *debug
diff --git a/overlays/magnum-ha.yaml b/overlays/magnum-ha.yaml
new file mode 100644
index 0000000..80c8634
--- /dev/null
+++ b/overlays/magnum-ha.yaml
@@ -0,0 +1,10 @@
+applications:
+  magnum:
+    options:
+      vip: __VIP__
+  magnum-hacluster:
+    charm: cs:~openstack-charmers-next/hacluster
+    options:
+      cluster_count: __NUM_MAGNUM_UNITS__
+relations:
+  - [ magnum, magnum-hacluster ]
diff --git a/overlays/magnum.yaml b/overlays/magnum.yaml
new file mode 100644
index 0000000..239abea
--- /dev/null
+++ b/overlays/magnum.yaml
@@ -0,0 +1,18 @@
+# Variables
+debug:                      &debug                     True
+verbose:                    &verbose                   True
+openstack_origin:           &openstack_origin          __OS_ORIGIN__
+
+applications:
+  magnum:
+    charm: cs:~openstack-charmers-next/magnum
+    num_units: 1
+    constraints: mem=1G
+    options:
+      debug: *debug
+      openstack-origin: *openstack_origin
+relations:
+  - [ magnum:amqp, rabbitmq-server:amqp ]
+  - [ magnum:shared-db, __MYSQL_INTERFACE__ ]
+  - [ magnum:identity-service, keystone:identity-service ]
+  - [ magnum:certificates, vault:certificates ]