stsstack-bundles

Merge ~hopem/stsstack-bundles:configure-autodetect-overlay-type into stsstack-bundles:master

  1. Git
  2. lp:~hopem/stsstack-bundles
  3. configure-autodetect-overlay-type
  4. Merge into master
Proposed by Edward Hope-Morley
Status: Merged
Merged at revision: 450dd28d78ff5b2000445cad114ba3e6552bdb6b
Proposed branch: ~hopem/stsstack-bundles:configure-autodetect-overlay-type
Merge into: stsstack-bundles:master
Diff against target: 15 lines (+3/-1)
1 file modified
openstack/profiles/default (+3/-1)
Reviewer Review Type Date Requested Status
Hemanth Nakkina Approve
Review via email: mp+386133@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Hemanth Nakkina (hemanth-n) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/openstack/profiles/default b/openstack/profiles/default
2index ce561e0..f09edcf 100755
3--- a/openstack/profiles/default
4+++ b/openstack/profiles/default
5@@ -21,7 +21,9 @@ if ((`juju status ovn-chassis --format=json 2>/dev/null| jq '.machines| length'`
6 # ovn defaults to geneve
7 net_type=${1:-"geneve"}
8 else
9- net_type=${1:-"gre"}
10+ net_type=${1:-""}
11+ [ -n "$net_type" ] || net_type="`juju config neutron-api overlay-network-type`"
12+ [ -n "$net_type" ] || net_type="gre"
13 fi
14
15 # add extra port to overcloud neutron-gateway (if exists) and configure charm to use it

Subscribers

People subscribed via source and target branches