Merge ~hypothetical-lemon/stsstack-bundles:octavia-ipv4 into stsstack-bundles:master

[Heather Lemon]

Add script with IPv4 support for Octavia

Currently, by default Octavia deploys with IPv6 network.
This script sets up Openstack with Octavia running with IPv4.
Wait for services to start, creates a novarc.services file.
Pulls out the password from the Octavia container.
Sources the octavia credentials to create the IPv4 network from
Octavia and not Admin credentials. Creates network, routers, subnet,
and security groups for Octavia network. Runs various tools for preperation
of deploying a loadbalancer. Deploys a loadbalancer to a private subnet
with create_octavia_lb.sh

Add new overlay option to deployment bundles: --octavia-ipv4
Used in conjunction with --octavia overlay option. Example openstack bundle option:
./generate-bundle.sh --octavia --octavia-ipv4 --create-model --name octavia --series focal --use-stable-charms --run

Turns off the create network option in octavia.yaml before deployment of bundle

[Edward Hope-Morley (hopem)]

Hi Heather thanks for this really useful contribution. I am going to give it a test run for myself and have a few initial comment for you inline.

review: Needs Fixing

[Heather Lemon (hypothetical-lemon)]

Ok sounds good. Thanks

[Edward Hope-Morley (hopem)]

Hi Heather, looks way better. I had to rebase your branch off master to get it to work as the MOD_MSG parsing wasn't in your branch. Can you please do 'git rebase -i master' to rebase and squash into a single commit. Couple of inline comments too. Thanks!

review: Needs Fixing

[Heather Lemon (hypothetical-lemon)]

> Hi Heather, looks way better. I had to rebase your branch off master to get it
> to work as the MOD_MSG parsing wasn't in your branch. Can you please do 'git
> rebase -i master' to rebase and squash into a single commit. Couple of inline
> comments too. Thanks!

Yeah sure no worries. I wasn't sure if I had to do anything else for everyone to see my updated changes or not.

[Heather Lemon (hypothetical-lemon)]

Fixed spaces, addressed comments, rebased from master

[Edward Hope-Morley (hopem)]

Thank Heather few more things. When you rebase master make sure to update your master branch first.

[Heather Lemon (hypothetical-lemon)]

Ok so moved all output messages under --octavia option.

[Heather Lemon (hypothetical-lemon)]

this command works with proper post op commands to follow
./generate-bundle.sh --octavia-ipv4 --create-model --name octavia --series focal --use-stable-charms

[Heather Lemon (hypothetical-lemon)]

add common command ./sec_groups.sh
combined message for octavia and octavia-ipv4

[Edward Hope-Morley (hopem)]

lgtm thanks Heather!

review: Approve

diff --git a/openstack/pipeline/00setup b/openstack/pipeline/00setup
index 807a275..12138b3 100644
--- a/openstack/pipeline/00setup
+++ b/openstack/pipeline/00setup
@@ -14,6 +14,8 @@ export -a MOD_PASSTHROUGH_OPTS=()
 export -A MOD_MSGS=()
 # Use order 0 to ensure this is first displayed
 MOD_MSGS[0_common.0]="run ./configure to initialise your deployment"
+MOD_MSGS[0_common.1]="source novarc"
+MOD_MSGS[0_common.2]="add rules to default security group: ./tools/sec_groups.sh"
 
 # Array list of overlays to use with this deployment.
 export -a MOD_OVERLAYS=()
diff --git a/openstack/pipeline/02configure b/openstack/pipeline/02configure
index 338cd5e..a10fd12 100644
--- a/openstack/pipeline/02configure
+++ b/openstack/pipeline/02configure
@@ -332,18 +332,33 @@ do
                 if ! has_opt --octavia-diskimage-retrofit-glance-simplestreams; then
                    MOD_OVERLAYS+=( "octavia-diskimage-retrofit-glance.yaml" )
                 fi
-                MOD_MSGS[octavia.0]="you need to to create an amphora image before you can use Octavia"
-                MOD_MSGS[octavia.1]="this can be done in one of two ways:"
-                MOD_MSGS[octavia.2]="run ./tools/upload_octavia_amphora_image.sh to use a pre-created image (recommended)"
-                MOD_MSGS[octavia.3]="create a new image with 'juju run-action octavia-diskimage-retrofit/0 --wait retrofit-image source-image=<uuid>' with id of image in Glance to use as base"
-                MOD_MSGS[octavia.4]="then run tools/configure_octavia.sh to finish setting up octavia"
             fi
+            MOD_MSGS[octavia.0]="you need to to create an amphora image before you can use Octavia"
+            MOD_MSGS[octavia.1]="this can be done in one of two ways:"
+            MOD_MSGS[octavia.2]="run ./tools/upload_octavia_amphora_image.sh --release $release to use a pre-created image (recommended)"
+            MOD_MSGS[octavia.3]="create a new image with 'juju run-action octavia-diskimage-retrofit/0 --wait retrofit-image source-image=<uuid>' with id of image in Glance to use as base"
+            if has_opt --octavia-ipv4; then
+                MOD_MSGS[octavia.4]="run tools/create_ipv4_octavia.sh"
+            fi
+            MOD_MSGS[octavia.5]="then run tools/configure_octavia.sh to finish setting up octavia"
+            MOD_MSGS[octavia.6]="create vm for testing"
+            MOD_MSGS[octavia.7]="./tools/instance_launch.sh 1 bionic"
+            MOD_MSGS[octavia.8]="add floating ip to vm with ./tools/float_all.sh "
+            MOD_MSGS[octavia.9]="go and install e.g. apache2 on vm so that port 80 is open"
+            MOD_MSGS[octavia.10]="create loadbalancer from script"
+            MOD_MSGS[octavia.11]="./tools/create_octavia_lb.sh"
+            MOD_MSGS[octavia.12]="alternatively manually create loadbalancer"
+            MOD_MSGS[octavia.13]="openstack loadbalancer create --name lb2 --vip-network-id lb-mgmt"
             ;;
         --octavia-ha*)
             get_units $1 __NUM_OCTAVIA_UNITS__ 3
             MOD_OVERLAYS+=( "octavia-ha.yaml" )
             set -- $@ --octavia && cache $@
             ;;
+        --octavia-ipv4)
+            MOD_OVERLAYS+=( "octavia-ipv4.yaml" )
+            set -- $@ --octavia && cache $@
+            ;;
         --octavia-diskimage-retrofit-glance-simplestreams)
             conflicts_with $1 --no-octavia-diskimage-retrofit
             set -- $@ --glance-simplestreams && cache $@
diff --git a/openstack/tools/create_ipv4_octavia.sh b/openstack/tools/create_ipv4_octavia.sh
new file mode 100755
index 0000000..c151abd
--- /dev/null
+++ b/openstack/tools/create_ipv4_octavia.sh
@@ -0,0 +1,37 @@
+#!/bin/bash
+
+# wait for services start
+while true; do
+    [[ `juju status keystone --format json | jq -r '.applications.keystone.units."keystone/0"."workload-status".current'` = active ]] \
+    && break
+    if [[ `juju status keystone --format json | jq -r '.applications.keystone.units."keystone/0"."workload-status".current'` = error ]]
+    then
+      echo "ERROR: Octavia deployment failed" 
+      break
+    fi
+done
+
+echo INFO: create temp novarc.services and extract octavia password
+touch /tmp/novarc.services
+
+cat << EOF > /tmp/novarc.services 
+OS_PROJECT_DOMAIN_NAME=service_domain
+OS_USERNAME=octavia
+OS_PROJECT_NAME=services
+OS_USER_DOMAIN_NAME=service_domain
+OS_PASSWORD=$(juju run --unit octavia/0 "grep -v "auth" /etc/octavia/octavia.conf | grep password" | awk '{print $3}')
+EOF
+source /tmp/novarc.services
+
+echo INFO: create octavia network, subnet, router, add subnet to router
+openstack network create lb-mgmt-net --tag charm-octavia
+openstack subnet create --tag charm-octavia --subnet-range 21.0.0.0/29 --dhcp  --ip-version 4 --network lb-mgmt-net lb-mgmt-subnet
+openstack router create lb-mgmt --tag charm-octavia
+openstack router add subnet lb-mgmt lb-mgmt-subnet
+
+echo INFO: add security rules
+openstack security group create lb-mgmt-sec-grp --tag charm-octavia 
+openstack security group create lb-health-mgr-sec-grp --tag charm-octavia-health 
+openstack security group rule create lb-mgmt-sec-grp --protocol icmp 
+openstack security group rule create lb-mgmt-sec-grp --protocol tcp --protocol tcp --dst-port 22 
+openstack security group rule create lb-mgmt-sec-grp --protocol tcp --dst-port 9443
diff --git a/overlays/octavia-ipv4.yaml b/overlays/octavia-ipv4.yaml
new file mode 100644
index 0000000..655107f
--- /dev/null
+++ b/overlays/octavia-ipv4.yaml
@@ -0,0 +1,4 @@
+applications:
+  octavia:
+    options:
+      create-mgmt-network: false