Rebase on next

2015-01-13 09:19:48 +00:00
parent c0b4ee344b 2fbabf5756
commit 7d63f9bdb2
21 changed files with 662 additions and 26 deletions
--- a/unit_tests/test_neutron_api_hooks.py
+++ b/unit_tests/test_neutron_api_hooks.py
@@ -50,6 +50,7 @@ TO_PATCH = [
    'get_iface_for_address',
    'get_netmask_for_address',
    'get_address_in_network',
+    'update_nrpe_config',
 ]
 NEUTRON_CONF_DIR = "/etc/neutron"