x/vmware-nsx
Code Issues Proposed changes

Use current neutron project for devstack & CI

Browse Source 
Change-Id: I43186a466dfff3f3c5dab25efcbe8037dc54f50f
This commit is contained in:
Adit Sarfaty 2018-03-26 09:36:25 +03:00
parent 385caaec09
commit 9e77debf51
2 changed files with 9 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
devstack/lib/nsx_common
View File

@ -29,7 +29,7 @@ function _nsxv_ini_set {
fi fi
} }
function nsxv_configure_service { function install_neutron_projects {
# TODO(boden): find a better way to use master branch dependencies in devstack # TODO(boden): find a better way to use master branch dependencies in devstack
sudo rm -rf /usr/local/lib/python2.7/dist-packages/networking_l2gw* sudo rm -rf /usr/local/lib/python2.7/dist-packages/networking_l2gw*
sudo pip install -e "git+https://git.openstack.org/openstack/networking-l2gw#egg=networking_l2gw" sudo pip install -e "git+https://git.openstack.org/openstack/networking-l2gw#egg=networking_l2gw"
@ -45,7 +45,13 @@ function nsxv_configure_service {
sudo pip install -e "git+https://git.openstack.org/openstack/neutron-vpnaas#egg=neutron_vpnaas" sudo pip install -e "git+https://git.openstack.org/openstack/neutron-vpnaas#egg=neutron_vpnaas"
sudo rm -rf /usr/local/lib/python2.7/dist-packages/vmware_nsxlib* sudo rm -rf /usr/local/lib/python2.7/dist-packages/vmware_nsxlib*
sudo pip install -e "git+https://git.openstack.org/openstack/vmware-nsxlib#egg=vmware_nsxlib" sudo pip install -e "git+https://git.openstack.org/openstack/vmware-nsxlib#egg=vmware_nsxlib"
sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron
sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron.egg*
sudo pip install -e "git+https://git.openstack.org/openstack/neutron#egg=neutron"
}
function nsxv_configure_service {
install_neutron_projects
if [[ "$NSX_L2GW_DRIVER" != "" ]]; then if [[ "$NSX_L2GW_DRIVER" != "" ]]; then
iniset /$Q_PLUGIN_CONF_FILE DEFAULT nsx_l2gw_driver $NSX_L2GW_DRIVER iniset /$Q_PLUGIN_CONF_FILE DEFAULT nsx_l2gw_driver $NSX_L2GW_DRIVER
fi fi
@ -108,21 +114,7 @@ function _nsxv3_ini_set {
} }
function nsxv3_configure_service { function nsxv3_configure_service {
# TODO(boden): find a better way to use master branch dependencies in devstack install_neutron_projects
sudo rm -rf /usr/local/lib/python2.7/dist-packages/networking_l2gw*
sudo pip install -e "git+https://git.openstack.org/openstack/networking-l2gw#egg=networking_l2gw"
sudo rm -rf /usr/local/lib/python2.7/dist-packages/networking_sfc*
sudo pip install -e "git+https://git.openstack.org/openstack/networking-sfc#egg=networking_sfc"
sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron_lbaas*
sudo pip install -e "git+https://git.openstack.org/openstack/neutron-lbaas#egg=neutron_lbaas"
sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron_fwaas*
sudo pip install -e "git+https://git.openstack.org/openstack/neutron-fwaas#egg=neutron_fwaas"
sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron_dynamic_routing*
sudo pip install -e "git+https://git.openstack.org/openstack/neutron-dynamic-routing#egg=neutron_dynamic_routing"
sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron_vpnaas*
sudo pip install -e "git+https://git.openstack.org/openstack/neutron-vpnaas#egg=neutron_vpnaas"
sudo rm -rf /usr/local/lib/python2.7/dist-packages/vmware_nsxlib*
sudo pip install -e "git+https://git.openstack.org/openstack/vmware-nsxlib#egg=vmware_nsxlib"
if [[ $1 == "nsx_v3" ]]; then if [[ $1 == "nsx_v3" ]]; then
_nsxv3_ini_set default_overlay_tz $DEFAULT_OVERLAY_TZ_UUID "The VMware NSX plugin won't work without a default transport zone." _nsxv3_ini_set default_overlay_tz $DEFAULT_OVERLAY_TZ_UUID "The VMware NSX plugin won't work without a default transport zone."

16
devstack/lib/vmware_nsx_tvd
View File

@ -112,21 +112,7 @@ function neutron_plugin_create_nova_conf {
function neutron_plugin_install_agent_packages { function neutron_plugin_install_agent_packages {
# VMware NSX Plugin does not run q-agt, but it currently needs dhcp and metadata agents # VMware NSX Plugin does not run q-agt, but it currently needs dhcp and metadata agents
_neutron_ovs_base_install_agent_packages _neutron_ovs_base_install_agent_packages
# TODO(boden): find a better way to use master branch dependencies in devstack install_neutron_projects
sudo rm -rf /usr/local/lib/python2.7/dist-packages/networking_l2gw*
sudo pip install -e "git+https://git.openstack.org/openstack/networking-l2gw#egg=networking_l2gw"
sudo rm -rf /usr/local/lib/python2.7/dist-packages/networking_sfc*
sudo pip install -e "git+https://git.openstack.org/openstack/networking-sfc#egg=networking_sfc"
sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron_lbaas*
sudo pip install -e "git+https://git.openstack.org/openstack/neutron-lbaas#egg=neutron_lbaas"
sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron_fwaas*
sudo pip install -e "git+https://git.openstack.org/openstack/neutron-fwaas#egg=neutron_fwaas"
sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron_dynamic_routing*
sudo pip install -e "git+https://git.openstack.org/openstack/neutron-dynamic-routing#egg=neutron_dynamic_routing"
sudo rm -rf /usr/local/lib/python2.7/dist-packages/neutron_vpnaas*
sudo pip install -e "git+https://git.openstack.org/openstack/neutron-vpnaas#egg=neutron_vpnaas"
sudo rm -rf /usr/local/lib/python2.7/dist-packages/vmware_nsxlib*
sudo pip install -e "git+https://git.openstack.org/openstack/vmware-nsxlib#egg=vmware_nsxlib"
} }
function neutron_plugin_configure_common { function neutron_plugin_configure_common {