Browse code

Merge "Revert "set the validation path to fixed for n-net"" into stable/liberty

Jenkins authored on 2016/01/23 14:35:17
Showing 1 changed files
... ...
@@ -357,9 +357,6 @@ function configure_tempest {
357 357
     iniset $TEMPEST_CONFIG compute flavor_ref $flavor_ref
358 358
     iniset $TEMPEST_CONFIG compute flavor_ref_alt $flavor_ref_alt
359 359
     iniset $TEMPEST_CONFIG compute ssh_connect_method $ssh_connect_method
360
-    # set the equiv validation option here as well to ensure they are
361
-    # in sync. They shouldn't be separate options.
362
-    iniset $TEMPEST_CONFIG validation connect_method $ssh_connect_method
363 360
     if [[ ! $(is_service_enabled n-cell) && ! $(is_service_enabled neutron) ]]; then
364 361
         iniset $TEMPEST_CONFIG compute fixed_network_name $PRIVATE_NETWORK_NAME
365 362
     fi