From 3631fc0ca58af8fb73d3417bd74a8444000fae37 Mon Sep 17 00:00:00 2001 From: Akihiro Motoki Date: Wed, 13 Jan 2016 22:48:08 +0900 Subject: [PATCH] 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 --- devstack/lib/vmware_dvs | 5 ----- devstack/lib/vmware_nsx | 5 ----- devstack/lib/vmware_nsx_v | 5 ----- devstack/lib/vmware_nsx_v3 | 5 ----- devstack/override-defaults | 4 ++++ 5 files changed, 4 insertions(+), 20 deletions(-) create mode 100644 devstack/override-defaults diff --git a/devstack/lib/vmware_dvs b/devstack/lib/vmware_dvs index 58df201146..a60e6776b5 100644 --- a/devstack/lib/vmware_dvs +++ b/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 } diff --git a/devstack/lib/vmware_nsx b/devstack/lib/vmware_nsx index aa8e22bbf0..f4f6db56fa 100644 --- a/devstack/lib/vmware_nsx +++ b/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 } diff --git a/devstack/lib/vmware_nsx_v b/devstack/lib/vmware_nsx_v index 68a09fadc4..8b0ac852bd 100644 --- a/devstack/lib/vmware_nsx_v +++ b/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 } diff --git a/devstack/lib/vmware_nsx_v3 b/devstack/lib/vmware_nsx_v3 index f3dc021a40..8b224e7b17 100644 --- a/devstack/lib/vmware_nsx_v3 +++ b/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 } diff --git a/devstack/override-defaults b/devstack/override-defaults new file mode 100644 index 0000000000..626940f794 --- /dev/null +++ b/devstack/override-defaults @@ -0,0 +1,4 @@ +function has_neutron_plugin_security_group { + # 0 means True here + return 0 +}