Merge ~hopem/stsstack-bundles:bug/1863230 into stsstack-bundles:master

[Edward Hope-Morley]

[Ivan Hitos (ivanhitos)]

lgtm

[Seyeong Kim (seyeongkim)]

not a big deal but could you please check my inline comment?

[Edward Hope-Morley (hopem)]

@xtrusia yes you are right, ill fix in my next patch

diff --git a/doc/openstack/octavia.md b/doc/openstack/octavia.md
index e9d3a6f..218db89 100644
--- a/doc/openstack/octavia.md
+++ b/doc/openstack/octavia.md
@@ -2,6 +2,14 @@
 
 To deploy octavia as part of an Openstack deployment just add the --octavia overlay. Once deployed there are a few actions that must be taken to configure Octavia before it can be used.
 
+NOTE: if you are using OVN as your neutron networking solution, you will need to perform the steps detailed in the ovn.md documentation before continuing
+
+Now you need to add an extra port to your nodes running neutron-openvswitch:
+
+```
+./bin/add-data-ports.sh
+```
+
 The following will download the Amphora image from (stsstack) Swift that corresponds to the deployed release of Openstack and upload it to your Glance.
 
 ```
@@ -15,3 +23,37 @@ tools/configure_octavia.sh
 ```
 
 https://docs.openstack.org/project-deploy-guide/charm-deployment-guide/latest/app-octavia.html
+
+## Using Octavia
+
+Create an instance and secgroup rules
+
+```
+source novarc
+./tools/sec_groups.sh &>2 &
+./tools/instance_launch.sh 1 bionic
+```
+
+Give it a floating ip and ensure it can be pinged (once booted)
+```
+./tools/float_all.sh
+ping __FIP__
+```
+
+Install apache
+```
+ssh __FIP__ -- 'sudo apt update; sudo apt install apache2 -y'
+```
+
+Now create a loadbalancer adding the vm just created to the LB pool
+```
+tools/create_octavia_lb.sh __VM_UUID__
+```
+
+Now check that your loadbalancer is up and load balancing to port 80 in the vm
+
+```
+lb_vip=$(openstack loadbalancer show lb1 -c vip_address -f value)
+lb_fip=$(openstack floating ip list|egrep -v "\+-+|ID"| awk "\\$6==\\"$lb_vip\\" {print \\$4}")
+nc -vz  $lb_fip 80
+```
diff --git a/doc/openstack/ovn.md b/doc/openstack/ovn.md
new file mode 100644
index 0000000..a9960a4
--- /dev/null
+++ b/doc/openstack/ovn.md
@@ -0,0 +1,31 @@
+# Deploying OVN
+
+The 20.02 release of the Openstack charms introduced OVN as an alternative to straight Openvswitch networking for Neutron.
+
+To switch your networking to OVN simply use --ovn. You will need to be using the Openstack Train release or above.
+
+Once deployed you will need to perform a few post-deployment actions;
+
+First you need to unseal vault:
+
+```
+./tools/vault-unseal-and-authorise.sh
+```
+
+Since ovn requires vault to be deployed and used for cert management you need to install the vault-generated CA to be able to speak to endpoints:
+
+```
+./tools/install_local_ca.sh
+```
+
+Now you need to add an extra port to your nodes running ovn-chassis (this the port that will be used as the "external network"):
+
+```
+./bin/add-data-ports.sh
+```
+
+And of course run the post-deploment configuration to setup the deployed cloud:
+
+```
+./configure.sh
+```
diff --git a/openstack/pipeline/02configure b/openstack/pipeline/02configure
index 7d0b20b..646d4bb 100644
--- a/openstack/pipeline/02configure
+++ b/openstack/pipeline/02configure
@@ -261,9 +261,13 @@ do
             get_param $1 __CONSOLE_TYPE__ "REQUIRES: nova console access protocol:"
             ;;
         --octavia)
-            conflicts_with $1 --ovn
-            # >= Rocky
-            assert_min_release rocky "octavia"
+            if `has_opt --ovn`; then
+                assert_min_release train "octavia+ovn"
+                MOD_OVERLAYS+=( "octavia-ovn.yaml" )
+            else
+                assert_min_release rocky "octavia"
+                MOD_OVERLAYS+=( "octavia-ovs.yaml" )
+            fi
             MOD_OVERLAYS+=( "octavia.yaml" )
             MOD_PARAMS[__AMPHORA_SSH_PUB_KEY__]="`get_amphora_ssh_pub_key`"
             if has_opt --openstack-dashboard*; then
@@ -329,7 +333,6 @@ do
             MOD_OVERLAYS+=( "neutron-sg-logging.yaml" )
             ;;
         --ovn)
-            conflicts_with $1 --octavia
             assert_min_release train "ovn"
             get_param $1 __OVN_DATA_PORT__ 'REQUIRED: ovn-chassis bridge-interface-mappings (leave blank to set later):'
             MOD_OVERLAYS+=( "neutron-ovn.yaml" )
diff --git a/overlays/octavia-ovn.yaml b/overlays/octavia-ovn.yaml
new file mode 100644
index 0000000..a81fb1f
--- /dev/null
+++ b/overlays/octavia-ovn.yaml
@@ -0,0 +1,3 @@
+relations:
+  - [ octavia:ovsdb-subordinate, ovn-chassis:ovsdb-subordinate ]
+  - [ octavia:ovsdb-cms, ovn-central:ovsdb-cms ]
diff --git a/overlays/octavia-ovs.yaml b/overlays/octavia-ovs.yaml
new file mode 100644
index 0000000..f6fe4d6
--- /dev/null
+++ b/overlays/octavia-ovs.yaml
@@ -0,0 +1,2 @@
+relations:
+  - [ octavia:neutron-openvswitch, neutron-openvswitch:neutron-plugin ]
diff --git a/overlays/octavia.yaml b/overlays/octavia.yaml
index 7f6ba84..59e0fe8 100644
--- a/overlays/octavia.yaml
+++ b/overlays/octavia.yaml
@@ -16,4 +16,3 @@ relations:
   - [ octavia:identity-service, keystone:identity-service ]
   - [ octavia:amqp, rabbitmq-server:amqp ]
   - [ octavia:neutron-api, neutron-api:neutron-load-balancer ]
-  - [ octavia:neutron-openvswitch, neutron-openvswitch:neutron-plugin ]