Browse Source

Merge "[devstack][ci] Move bgp setup to plugin" into stable/queens

changes/19/743619/1
Zuul 2 weeks ago
committed by Gerrit Code Review
parent
commit
1a5796908c
2 changed files with 13 additions and 8 deletions
  1. +0
    -8
      contrib/ci/post_test_hook.sh
  2. +13
    -0
      devstack/plugin.sh

+ 0
- 8
contrib/ci/post_test_hook.sh View File

@@ -337,14 +337,6 @@ source $BASE/new/devstack/openrc admin admin
public_net_id=$(openstack network list --name $PUBLIC_NETWORK_NAME -f value -c ID )
iniset $TEMPEST_CONFIG network public_network_id $public_net_id

# Now that all plugins are loaded, setup BGP here
if [ $(trueorfalse False MANILA_SETUP_IPV6) == True ]; then
neutron bgp-speaker-create --ip-version 6 --local-as 100 bgpspeaker
neutron bgp-speaker-network-add bgpspeaker $PUBLIC_NETWORK_NAME
neutron bgp-peer-create --peer-ip ::1 --remote-as 200 bgppeer
neutron bgp-speaker-peer-add bgpspeaker bgppeer
fi

# Set config to run IPv6 tests according to env var
iniset $TEMPEST_CONFIG share run_ipv6_tests $RUN_MANILA_IPV6_TESTS



+ 13
- 0
devstack/plugin.sh View File

@@ -1096,6 +1096,13 @@ function setup_ipv6 {

}

function setup_bgp_for_ipv6 {
neutron bgp-speaker-create --ip-version 6 --local-as 100 bgpspeaker
neutron bgp-speaker-network-add bgpspeaker $PUBLIC_NETWORK_NAME
neutron bgp-peer-create --peer-ip ::1 --remote-as 200 bgppeer
neutron bgp-speaker-peer-add bgpspeaker bgppeer
}

# Main dispatcher
if [[ "$1" == "stack" && "$2" == "install" ]]; then
echo_summary "Installing Manila Client"
@@ -1214,6 +1221,12 @@ elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
allow_host_ports_for_share_mounting
fi

if [[ "$(trueorfalse False MANILA_SETUP_IPV6)" == "True" ]]; then
# Now that all plugins are loaded, setup BGP
echo_summary "Setting up BGP speaker to advertise routes to project networks"
setup_bgp_for_ipv6
fi

fi

if [[ "$1" == "unstack" ]]; then


Loading…
Cancel
Save