Merge ~lathiat/stsstack-bundles:master into stsstack-bundles:master

Proposed by Trent Lloyd
Status: Merged
Merged at revision: b7f78be366d719215a2d32705aae0b8d25a6c897
Proposed branch: ~lathiat/stsstack-bundles:master
Merge into: stsstack-bundles:master
Diff against target: 13 lines (+1/-1)
1 file modified
openstack/openstack.yaml.template (+1/-1)
Reviewer Review Type Date Requested Status
Jolly Bundlers Pending
Review via email: mp+392029@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/openstack/openstack.yaml.template b/openstack/openstack.yaml.template
2index 99d6338..8269d8c 100644
3--- a/openstack/openstack.yaml.template
4+++ b/openstack/openstack.yaml.template
5@@ -55,7 +55,7 @@ applications:
6 options:
7 debug: *debug
8 verbose: *verbose
9- overlay-network-type: 'vxlan gre geneve'
10+ overlay-network-type: 'vxlan gre'
11 default-tenant-network-type: __OVERLAY_NETWORK_TYPE__
12 neutron-security-groups: True
13 flat-network-providers: physnet1

Subscribers

People subscribed via source and target branches