From 8b5406e228e83e5b83a32f67fe2ea5e49a90016d Mon Sep 17 00:00:00 2001 From: Roey Chen Date: Mon, 22 Dec 2014 04:57:22 -0800 Subject: [PATCH] vmware-nsx: Vendor code split Devstack support is added using Devstack's external plugins: https://review.openstack.org/#/c/156526 Asside to the environment variables, the following should be added to local.conf file: enable_plugin vmware-nsx https://git.openstack.org/stackforge/vmware-nsx for the nsx plugin: Q_PLUGIN=vmware_nsx enable_service vmware_nsx for the nsx_v plugin: Q_PLUGIN=vmware_nsx_v Partially-Implements: blueprint vmware-nsx-v Change-Id: I4e03d4953bf9b5112ff75a252b61c27fadd04bf1 Signed-off-by: Roey Chen --- lib/neutron_plugins/vmware_nsx | 143 +----------------------------- lib/neutron_plugins/vmware_nsx_v | 10 +++ lib/neutron_thirdparty/vmware_nsx | 91 +------------------ 3 files changed, 15 insertions(+), 229 deletions(-) create mode 100644 lib/neutron_plugins/vmware_nsx_v diff --git a/lib/neutron_plugins/vmware_nsx b/lib/neutron_plugins/vmware_nsx index 4cbedd6de4..b6c1c9c13f 100644 --- a/lib/neutron_plugins/vmware_nsx +++ b/lib/neutron_plugins/vmware_nsx @@ -1,147 +1,10 @@ #!/bin/bash -# -# Neutron VMware NSX plugin -# ------------------------- -# Save trace setting -NSX_XTRACE=$(set +o | grep xtrace) -set +o xtrace - -source $TOP_DIR/lib/neutron_plugins/ovs_base - -function setup_integration_bridge { - _neutron_ovs_base_setup_bridge $OVS_BRIDGE - # Set manager to NSX controller (1st of list) - if [[ "$NSX_CONTROLLERS" != "" ]]; then - # Get the first controller - controllers=(${NSX_CONTROLLERS//,/ }) - OVS_MGR_IP=${controllers[0]} - else - die $LINENO "Error - No controller specified. Unable to set a manager for OVS" - fi - sudo ovs-vsctl set-manager ssl:$OVS_MGR_IP -} - -function is_neutron_ovs_base_plugin { - # NSX uses OVS, but not the l3-agent - return 0 -} - -function neutron_plugin_create_nova_conf { - # if n-cpu is enabled, then setup integration bridge - if is_service_enabled n-cpu; then - setup_integration_bridge - fi -} - -function neutron_plugin_install_agent_packages { - # VMware NSX Plugin does not run q-agt, but it currently needs dhcp and metadata agents - _neutron_ovs_base_install_agent_packages -} - -function neutron_plugin_configure_common { - Q_PLUGIN_CONF_PATH=etc/neutron/plugins/vmware - Q_PLUGIN_CONF_FILENAME=nsx.ini - Q_PLUGIN_CLASS="neutron.plugins.vmware.plugin.NsxPlugin" -} - -function neutron_plugin_configure_debug_command { - sudo ovs-vsctl --no-wait -- --may-exist add-br $PUBLIC_BRIDGE - iniset $NEUTRON_TEST_CONFIG_FILE DEFAULT external_network_bridge "$PUBLIC_BRIDGE" -} - -function neutron_plugin_configure_dhcp_agent { - setup_integration_bridge - iniset $Q_DHCP_CONF_FILE DEFAULT enable_isolated_metadata True - iniset $Q_DHCP_CONF_FILE DEFAULT enable_metadata_network True - iniset $Q_DHCP_CONF_FILE DEFAULT ovs_use_veth True -} - -function neutron_plugin_configure_l3_agent { - # VMware NSX plugin does not run L3 agent - die $LINENO "q-l3 should not be executed with VMware NSX plugin!" -} - -function neutron_plugin_configure_plugin_agent { - # VMware NSX plugin does not run L2 agent - die $LINENO "q-agt must not be executed with VMware NSX plugin!" -} - -function neutron_plugin_configure_service { - if [[ "$MAX_LP_PER_BRIDGED_LS" != "" ]]; then - iniset /$Q_PLUGIN_CONF_FILE nsx max_lp_per_bridged_ls $MAX_LP_PER_BRIDGED_LS - fi - if [[ "$MAX_LP_PER_OVERLAY_LS" != "" ]]; then - iniset /$Q_PLUGIN_CONF_FILE nsx max_lp_per_overlay_ls $MAX_LP_PER_OVERLAY_LS - fi - if [[ "$FAILOVER_TIME" != "" ]]; then - iniset /$Q_PLUGIN_CONF_FILE nsx failover_time $FAILOVER_TIME - fi - if [[ "$CONCURRENT_CONNECTIONS" != "" ]]; then - iniset /$Q_PLUGIN_CONF_FILE nsx concurrent_connections $CONCURRENT_CONNECTIONS - fi - - if [[ "$DEFAULT_TZ_UUID" != "" ]]; then - iniset /$Q_PLUGIN_CONF_FILE DEFAULT default_tz_uuid $DEFAULT_TZ_UUID - else - die $LINENO "The VMware NSX plugin won't work without a default transport zone." - fi - if [[ "$DEFAULT_L3_GW_SVC_UUID" != "" ]]; then - iniset /$Q_PLUGIN_CONF_FILE DEFAULT default_l3_gw_service_uuid $DEFAULT_L3_GW_SVC_UUID - Q_L3_ENABLED=True - Q_L3_ROUTER_PER_TENANT=True - iniset /$Q_PLUGIN_CONF_FILE nsx metadata_mode access_network - fi - if [[ "$DEFAULT_L2_GW_SVC_UUID" != "" ]]; then - iniset /$Q_PLUGIN_CONF_FILE DEFAULT default_l2_gw_service_uuid $DEFAULT_L2_GW_SVC_UUID - fi - # NSX_CONTROLLERS must be a comma separated string - if [[ "$NSX_CONTROLLERS" != "" ]]; then - iniset /$Q_PLUGIN_CONF_FILE DEFAULT nsx_controllers $NSX_CONTROLLERS - else - die $LINENO "The VMware NSX plugin needs at least an NSX controller." - fi - if [[ "$NSX_USER" != "" ]]; then - iniset /$Q_PLUGIN_CONF_FILE DEFAULT nsx_user $NSX_USER - fi - if [[ "$NSX_PASSWORD" != "" ]]; then - iniset /$Q_PLUGIN_CONF_FILE DEFAULT nsx_password $NSX_PASSWORD - fi - if [[ "$NSX_HTTP_TIMEOUT" != "" ]]; then - iniset /$Q_PLUGIN_CONF_FILE DEFAULT http_timeout $NSX_HTTP_TIMEOUT - fi - if [[ "$NSX_RETRIES" != "" ]]; then - iniset /$Q_PLUGIN_CONF_FILE DEFAULT retries $NSX_RETRIES - fi - if [[ "$NSX_REDIRECTS" != "" ]]; then - iniset /$Q_PLUGIN_CONF_FILE DEFAULT redirects $NSX_REDIRECTS - fi - if [[ "$AGENT_MODE" != "" ]]; then - iniset /$Q_PLUGIN_CONF_FILE nsx agent_mode $AGENT_MODE - if [[ "$AGENT_MODE" == "agentless" ]]; then - if [[ "$DEFAULT_SERVICE_CLUSTER_UUID" != "" ]]; then - iniset /$Q_PLUGIN_CONF_FILE DEFAULT default_service_cluster_uuid $DEFAULT_SERVICE_CLUSTER_UUID - else - die $LINENO "Agentless mode requires a service cluster." - fi - iniset /$Q_PLUGIN_CONF_FILE nsx_metadata metadata_server_address $Q_META_DATA_IP - fi - fi -} - -function neutron_plugin_setup_interface_driver { - local conf_file=$1 - iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver -} +# This file is needed so Q_PLUGIN=vmware_nsx will work. +# FIXME(salv-orlando): This function should not be here, but unfortunately +# devstack calls it before the external plugins are fetched function has_neutron_plugin_security_group { # 0 means True here return 0 } - -function neutron_plugin_check_adv_test_requirements { - is_service_enabled q-dhcp && return 0 -} - -# Restore xtrace -$NSX_XTRACE diff --git a/lib/neutron_plugins/vmware_nsx_v b/lib/neutron_plugins/vmware_nsx_v new file mode 100644 index 0000000000..3d33c652d1 --- /dev/null +++ b/lib/neutron_plugins/vmware_nsx_v @@ -0,0 +1,10 @@ +#!/bin/bash +# +# This file is needed so Q_PLUGIN=vmware_nsx_v will work. + +# FIXME(salv-orlando): This function should not be here, but unfortunately +# devstack calls it before the external plugins are fetched +function has_neutron_plugin_security_group { + # 0 means True here + return 0 +} diff --git a/lib/neutron_thirdparty/vmware_nsx b/lib/neutron_thirdparty/vmware_nsx index 7027a29892..03853a9bf4 100644 --- a/lib/neutron_thirdparty/vmware_nsx +++ b/lib/neutron_thirdparty/vmware_nsx @@ -1,89 +1,2 @@ -#!/bin/bash -# -# VMware NSX -# ---------- - -# This third-party addition can be used to configure connectivity between a DevStack instance -# and an NSX Gateway in dev/test environments. In order to use this correctly, the following -# env variables need to be set (e.g. in your localrc file): -# -# * enable_service vmware_nsx --> to execute this third-party addition -# * PUBLIC_BRIDGE --> bridge used for external connectivity, typically br-ex -# * NSX_GATEWAY_NETWORK_INTERFACE --> interface used to communicate with the NSX Gateway -# * NSX_GATEWAY_NETWORK_CIDR --> CIDR to configure $PUBLIC_BRIDGE, e.g. 172.24.4.211/24 - -# Save trace setting -NSX3_XTRACE=$(set +o | grep xtrace) -set +o xtrace - -# This is the interface that connects the Devstack instance -# to an network that allows it to talk to the gateway for -# testing purposes -NSX_GATEWAY_NETWORK_INTERFACE=${NSX_GATEWAY_NETWORK_INTERFACE:-eth2} -# Re-declare floating range as it's needed also in stop_vmware_nsx, which -# is invoked by unstack.sh -FLOATING_RANGE=${FLOATING_RANGE:-172.24.4.0/24} - -function configure_vmware_nsx { - : -} - -function init_vmware_nsx { - if ! is_set NSX_GATEWAY_NETWORK_CIDR; then - NSX_GATEWAY_NETWORK_CIDR=$PUBLIC_NETWORK_GATEWAY/${FLOATING_RANGE#*/} - echo "The IP address to set on $PUBLIC_BRIDGE was not specified. " - echo "Defaulting to "$NSX_GATEWAY_NETWORK_CIDR - fi - # Make sure the interface is up, but not configured - sudo ip link set $NSX_GATEWAY_NETWORK_INTERFACE up - # Save and then flush the IP addresses on the interface - addresses=$(ip addr show dev $NSX_GATEWAY_NETWORK_INTERFACE | grep inet | awk {'print $2'}) - sudo ip addr flush $NSX_GATEWAY_NETWORK_INTERFACE - # Use the PUBLIC Bridge to route traffic to the NSX gateway - # NOTE(armando-migliaccio): if running in a nested environment this will work - # only with mac learning enabled, portsecurity and security profiles disabled - # The public bridge might not exist for the NSX plugin if Q_USE_DEBUG_COMMAND is off - # Try to create it anyway - sudo ovs-vsctl --may-exist add-br $PUBLIC_BRIDGE - sudo ovs-vsctl --may-exist add-port $PUBLIC_BRIDGE $NSX_GATEWAY_NETWORK_INTERFACE - nsx_gw_net_if_mac=$(ip link show $NSX_GATEWAY_NETWORK_INTERFACE | awk '/ether/ {print $2}') - sudo ip link set address $nsx_gw_net_if_mac dev $PUBLIC_BRIDGE - for address in $addresses; do - sudo ip addr add dev $PUBLIC_BRIDGE $address - done - sudo ip addr add dev $PUBLIC_BRIDGE $NSX_GATEWAY_NETWORK_CIDR - sudo ip link set $PUBLIC_BRIDGE up -} - -function install_vmware_nsx { - : -} - -function start_vmware_nsx { - : -} - -function stop_vmware_nsx { - if ! is_set NSX_GATEWAY_NETWORK_CIDR; then - NSX_GATEWAY_NETWORK_CIDR=$PUBLIC_NETWORK_GATEWAY/${FLOATING_RANGE#*/} - echo "The IP address expected on $PUBLIC_BRIDGE was not specified. " - echo "Defaulting to "$NSX_GATEWAY_NETWORK_CIDR - fi - sudo ip addr del $NSX_GATEWAY_NETWORK_CIDR dev $PUBLIC_BRIDGE - # Save and then flush remaining addresses on the interface - addresses=$(ip addr show dev $PUBLIC_BRIDGE | grep inet | awk {'print $2'}) - sudo ip addr flush $PUBLIC_BRIDGE - # Try to detach physical interface from PUBLIC_BRIDGE - sudo ovs-vsctl del-port $NSX_GATEWAY_NETWORK_INTERFACE - # Restore addresses on NSX_GATEWAY_NETWORK_INTERFACE - for address in $addresses; do - sudo ip addr add dev $NSX_GATEWAY_NETWORK_INTERFACE $address - done -} - -function check_vmware_nsx { - neutron-check-nsx-config $NEUTRON_CONF_DIR/plugins/vmware/nsx.ini -} - -# Restore xtrace -$NSX3_XTRACE +# REVISIT(roeyc): this file left empty so that 'enable_service vmware_nsx' +# continues to work.