devstack: support non-legacy neutron

Code Issues Proposed changes

This adjust the devstack plugin code to work in the case
where new neutron devstack service names (neutron-*) are
used instead of the neutron-legacy devstack services names (q-*).
Change-Id: I557cf268ae12cce3352330ec0d30006f3d598f2e
Depends-On: I55aefa9ac1aaf0f69a7a31365439141633183722
Closes-Bug: 1769601

This commit is contained in:

Thomas Morin

2018年05月07日 11:40:04 +02:00

committed by Thomas Morin

parent 0c2be4aa67

commit c10e9b9e0c

3 changed files with 27 additions and 25 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

2
devstack/devstack-gate-bagpipe-rc

View File

@@ -1,6 +1,6 @@

# This file is hooked from https://github.com/openstack-infra/project-config/blob/master/jenkins/jobs/networking-bgpvpn.yaml

export OVERRIDE_ENABLED_SERVICES=n-api,n-crt,n-cpu,n-cond,n-sch,placement-api,q-svc,q-agt,g-api,g-reg,q-dhcp,q-l3,q-meta,key,mysql,rabbit,b-bgp,n-api-meta

export OVERRIDE_ENABLED_SERVICES=n-api,n-crt,n-cpu,n-cond,n-api-meta,n-sch,placement-api,g-api,g-reg,neutron-api,neutron-agent,neutron-dhcp,neutron-l3,neutron-metadata-agent,neutron-bagpipe-bgp,key,mysql,rabbit

if [[ $DEVSTACK_GATE_TEMPEST -eq 1 ]] ; then

export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1

2
devstack/devstack-gate-rc

View File

@@ -1,4 +1,4 @@

# This file is hooked from https://github.com/openstack-infra/project-config/blob/master/jenkins/jobs/networking-bgpvpn.yaml

export OVERRIDE_ENABLED_SERVICES=q-svc,q-agt,q-dhcp,q-l3,key,mysql,rabbit

export OVERRIDE_ENABLED_SERVICES=neutron-api,neutron-agent,neutron-dhcp,neutron-l3,key,mysql,rabbit

48
devstack/plugin.sh

View File

@@ -10,42 +10,44 @@ if [[ "1ドル" == "source" ]]; then

elif [[ "1ドル" == "stack" && "2ドル" == "install" ]]; then

echo_summary "Installing networking-bgpvpn"

setup_develop $NETWORKING_BGPVPN_DIR

elif [[ "1ドル" == "stack" && "2ドル" == "pre-install" ]]; then

echo_summary "Enabling networking-bgpvpn service plugin"

_neutron_service_plugin_class_add bgpvpn

if [[ "$Q_AGENT" == "bagpipe-openvswitch" ]]; then

echo "networking-bagpipe: you don't need to set Q_AGENT=bagpipe-openvswitch anymore"

Q_AGENT=openvswitch``

fi

elif [[ "1ドル" == "stack" && "2ドル" == "test-config" ]]; then

if is_service_enabled tempest; then

echo_summary "Enabling bgpvpn in $TEMPEST_CONFIG"

fi

elif [[ "1ドル" == "stack" && "2ドル" == "post-config" ]]; then

if is_service_enabled q-svc; then

if is_service_enabled neutron-api || is_service_enabled q-svc; then

echo_summary "Configuring networking-bgpvpn"

neutron_service_plugin_class_add bgpvpn

 mkdir -v -p $NEUTRON_CONF_DIR/policy.d && cp -v $NETWORKING_BGPVPN_DIR/etc/neutron/policy.d/bgpvpn.conf $NEUTRON_CONF_DIR/policy.d

 mkdir -v -p $(dirname $NETWORKING_BGPVPN_CONF) && cp -v $NETWORKING_BGPVPN_DIR/etc/neutron/networking_bgpvpn.conf $NETWORKING_BGPVPN_CONF

inicomment $NETWORKING_BGPVPN_CONF service_providers service_provider

iniadd $NETWORKING_BGPVPN_CONF service_providers service_provider $NETWORKING_BGPVPN_DRIVER

neutron_server_config_add $NETWORKING_BGPVPN_CONF

fi

if is_service_enabled q-agt && is_service_enabled b-bgp ; then

 if (is_service_enabled neutron-agent || is_service_enabled q-agt) && (is_service_enabled b-bgp || is_service_enabled neutron-bagpipe-bgp); then

echo_summary "Configuring agent for bagpipe bgpvpn"

source $NEUTRON_DIR/devstack/lib/l2_agent

plugin_agent_add_l2_agent_extension bagpipe_bgpvpn

configure_l2_agent

if [[ "$Q_AGENT" == "openvswitch" ]]; then

# l2pop and arp_responder are required for bagpipe driver

iniset /$Q_PLUGIN_CONF_FILE agent l2_population True

iniset /$Q_PLUGIN_CONF_FILE agent arp_responder True

elif [[ "$Q_AGENT" == "linuxbridge" ]]; then

# l2pop is required for EVPN/VXLAN bagpipe driver

iniset /$Q_PLUGIN_CONF_FILE vxlan l2_population True

if is_neutron_legacy_enabled; then

if [[ "$Q_AGENT" == "openvswitch" ]]; then

# l2pop and arp_responder are required for bagpipe driver

iniset /$Q_PLUGIN_CONF_FILE agent l2_population True

iniset /$Q_PLUGIN_CONF_FILE agent arp_responder True

elif [[ "$Q_AGENT" == "linuxbridge" ]]; then

# l2pop is required for EVPN/VXLAN bagpipe driver

iniset /$Q_PLUGIN_CONF_FILE vxlan l2_population True

else

die $LINENO "unsupported agent for networking-bagpipe: $Q_AGENT"

fi

else

die $LINENO "unsupported agent for networking-bagpipe: $Q_AGENT"

fi

if [[ "$NEUTRON_AGENT" == "openvswitch" ]]; then

# l2pop and arp_responder are required for bagpipe driver

iniset $NEUTRON_CORE_PLUGIN_CONF agent l2_population True

iniset $NEUTRON_CORE_PLUGIN_CONF agent arp_responder True

elif [[ "$NEUTRON_AGENT" == "linuxbridge" ]]; then

# l2pop is required for EVPN/VXLAN bagpipe driver

iniset $NEUTRON_CORE_PLUGIN_CONF vxlan l2_population True

else

die $LINENO "unsupported agent for networking-bagpipe: $NEUTRON_AGENT"

fi

if is_service_enabled h-eng; then

echo_summary "Enabling bgpvpn in $HEAT_CONF"