commit 3e30662930a0716f35dd510117780df322747252
author Jenkins <jenkins@review.openstack.org> Thu Sep 17 13:42:52 2015 +0000
committer Gerrit Code Review <review@openstack.org> Thu Sep 17 13:42:52 2015 +0000
tree 37d710154d2932ae95b4e42781cf3c28c791fb64
parent 18b3681d570c0eea2699484be9f8e74ee96b8868
parent ceae204217136a27d685dbd3af98e35be09f31a9

Merge "Add possibility to skip test_subnet_details if DHCP client not available"

tempest/config.py

diff --git a/tempest/config.py b/tempest/config.py
index b867980..3d3ddff 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -1048,7 +1048,7 @@
     # TODO(yfried): add support for dhcpcd
     cfg.StrOpt('dhcp_client',
                default='udhcpc',
-               choices=["udhcpc", "dhclient"],
+               choices=["udhcpc", "dhclient", ""],
                help='DHCP client used by images to renew DCHP lease. '
                     'If left empty, update operation will be skipped. '
                     'Supported clients: "udhcpc", "dhclient"')