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

[Edward Hope-Morley]

[Heather Lemon (hypothetical-lemon)]

+1

review: Approve

diff --git a/overlays/octavia-ovs.yaml b/overlays/octavia-ovs.yaml
index f6fe4d6..1228b81 100644
--- a/overlays/octavia-ovs.yaml
+++ b/overlays/octavia-ovs.yaml
@@ -1,2 +1,17 @@
+# Variables
+debug:                      &debug                     True
+verbose:                    &verbose                   True
+
+applications:
+  neutron-openvswitch-octavia:
+    charm: cs:~openstack-charmers-next/neutron-openvswitch
+    options:
+      debug: *debug
+      verbose: *verbose
+      firewall-driver: __NEUTRON_FW_DRIVER__
+      enable-local-dhcp-and-metadata: False  # ensure no dhcp or metdata on this unit
+      use-dvr-snat: False  # ensure no need for ext connectivity on this unit
 relations:
-  - [ octavia:neutron-openvswitch, neutron-openvswitch:neutron-plugin ]
+  - [ octavia:neutron-openvswitch, neutron-openvswitch-octavia:neutron-plugin ]
+  - [ neutron-api, neutron-openvswitch-octavia ]
+  - [ neutron-openvswitch-octavia, rabbitmq-server ]