From 4cacdaa56086e2ae638b956f863c99f05a23d041 Mon Sep 17 00:00:00 2001 From: Sean Mooney Date: Fri, 20 May 2016 20:37:17 +0100 Subject: [PATCH] remove unused entrypoints - stevedore enterypoints for intree plugins should be defined in setup.cfg. - This change remove the entrypoint definitions from setup.py as they are not needed. Change-Id: Id768d3fe28d8dfe350a75f88eca62022ac7074c0 --- .../fix-stevedore-entrypoints-8002ec7a5166c977.yaml | 6 ++++++ setup.py | 13 ------------- 2 files changed, 6 insertions(+), 13 deletions(-) create mode 100644 releasenotes/notes/fix-stevedore-entrypoints-8002ec7a5166c977.yaml diff --git a/releasenotes/notes/fix-stevedore-entrypoints-8002ec7a5166c977.yaml b/releasenotes/notes/fix-stevedore-entrypoints-8002ec7a5166c977.yaml new file mode 100644 index 0000000..2ebe632 --- /dev/null +++ b/releasenotes/notes/fix-stevedore-entrypoints-8002ec7a5166c977.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - os-vif plugins were previously incorrectly registered + in both the setup.py and setup.cfg. All plugin registration + have been removed form the setup.py as they were not used + and may have blocked registration of out of tree plugins. diff --git a/setup.py b/setup.py index 148a23f..7363757 100644 --- a/setup.py +++ b/setup.py @@ -27,17 +27,4 @@ except ImportError: setuptools.setup( setup_requires=['pbr'], - entry_points={ - 'os_vif.plugin': [ - 'bridge = os_vif._plugins.linux_bridge:LinuxBridgePlugin', - 'iovisor = os_vif._plugins.iovisor:IovisorPlugin', - 'ivs = os_vif._plugins.ivs:IvsPlugin', - 'ivs_hybrid = os_vif._plugins.ivs_hybrid:IvsHybridPlugin', - 'ovs = os_vif._plugins.ovs:OvsPlugin', - 'ovs_hybrid = os_vif._plugins.ovs_hybrid:OvsHybridPlugin', - 'mlnx = os_vif._plugins.mellanox:MellanoxDirectPlugin', - 'midonet = os_vif._plugins.midonet:MidonetPlugin', - 'vhostuser = os_vif._plugins.vhostuser:VhostuserPlugin', - 'vrouter = os_vif._plugins.vrouter:VrouterPlugin', - ]}, pbr=True)