Browse Source

Define has_neutron_plugin_security_group using override-defaults

DevStack now privides a mechanism to define methods before loading
lib/*. Previously has_neutron_plugin_security_group is used before
an external DevStack plugin is loaded, so we need to define this
method in the master DevStack repo. Now we can define this method
by using the override-defaults mechanism. This allows us to remove
a plugin-specific definition from the master DevStack repo.

Needed-By: Ib0f6e3d9463357d2dd66a2d61b8c722fa1f0bfba
Change-Id: I8b19b8f1b0694a96132f158146848aee7d14e8ff
changes/23/266923/3
Akihiro Motoki 6 years ago
parent
commit
3631fc0ca5
  1. 5
      devstack/lib/vmware_dvs
  2. 5
      devstack/lib/vmware_nsx
  3. 5
      devstack/lib/vmware_nsx_v
  4. 5
      devstack/lib/vmware_nsx_v3
  5. 4
      devstack/override-defaults

5
devstack/lib/vmware_dvs

@ -99,11 +99,6 @@ function neutron_plugin_setup_interface_driver {
iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver
}
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
}

5
devstack/lib/vmware_nsx

@ -155,11 +155,6 @@ function neutron_plugin_setup_interface_driver {
iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver
}
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
}

5
devstack/lib/vmware_nsx_v

@ -115,11 +115,6 @@ function neutron_plugin_setup_interface_driver {
:
}
function has_neutron_plugin_security_group {
# 0 means True here
return 0
}
function neutron_plugin_check_adv_test_requirements {
return 0
}

5
devstack/lib/vmware_nsx_v3

@ -123,11 +123,6 @@ function neutron_plugin_setup_interface_driver {
iniset $conf_file DEFAULT interface_driver neutron.agent.linux.interface.OVSInterfaceDriver
}
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
}

4
devstack/override-defaults

@ -0,0 +1,4 @@
function has_neutron_plugin_security_group {
# 0 means True here
return 0
}
Loading…
Cancel
Save