stsstack-bundles

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

  1. Git
  2. lp:~hopem/stsstack-bundles
  3. bug/1896793
  4. Merge into master
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 6f7868bb74f1a64fad46480073d966143efd1bba
Proposed branch: ~hopem/stsstack-bundles:bug/1896793
Merge into: stsstack-bundles:master
Diff against target: 23 lines (+16/-1)
1 file modified
overlays/octavia-ovs.yaml (+16/-1)
Reviewer Review Type Date Requested Status
Heather Lemon (community) Approve
Jolly Bundlers Pending
Review via email: mp+391214@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Heather Lemon (hypothetical-lemon) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/overlays/octavia-ovs.yaml b/overlays/octavia-ovs.yaml
2index f6fe4d6..1228b81 100644
3--- a/overlays/octavia-ovs.yaml
4+++ b/overlays/octavia-ovs.yaml
5@@ -1,2 +1,17 @@
6+# Variables
7+debug: &debug True
8+verbose: &verbose True
9+
10+applications:
11+ neutron-openvswitch-octavia:
12+ charm: cs:~openstack-charmers-next/neutron-openvswitch
13+ options:
14+ debug: *debug
15+ verbose: *verbose
16+ firewall-driver: __NEUTRON_FW_DRIVER__
17+ enable-local-dhcp-and-metadata: False # ensure no dhcp or metdata on this unit
18+ use-dvr-snat: False # ensure no need for ext connectivity on this unit
19 relations:
20- - [ octavia:neutron-openvswitch, neutron-openvswitch:neutron-plugin ]
21+ - [ octavia:neutron-openvswitch, neutron-openvswitch-octavia:neutron-plugin ]
22+ - [ neutron-api, neutron-openvswitch-octavia ]
23+ - [ neutron-openvswitch-octavia, rabbitmq-server ]

Subscribers

People subscribed via source and target branches