Merge pull request #359 from swormke/feature.bbot.mitaka

Update systest infrastructure to use mitaka instead of liberty

systest/Makefile

@@ -56,7 +56,7 @@ export NEUTRON_LBAAS_BRANCH := stable/mitaka
 export PATH := /tools/bin:$(PATH)
 export PYTHONPATH := /tools/lib:/tools/bin:$(PYTHONPATH)
 export USER := buildbot
-export TEST_OPENSTACK_DISTRO := liberty
+export TEST_OPENSTACK_DISTRO := $(BRANCH)
 export TEST_VE_IMAGE := os_ready-BIGIP-11.6.0.0.0.401.qcow2
 export TEST_CIRROS_IMAGE := cirros-0.3.4-x86_64-disk.qcow2
 export TEST_OPENSTACK_NODE_COUNT := 2

systest/scripts/tempest_setup.sh

@@ -56,20 +56,7 @@ cat ${TEMPEST_CONFIG_DIR}/tempest.conf.orig \
   | sed "s/{{ OS_CIRROS_IMAGE_ID }}/${OS_CIRROS_IMAGE_ID}/" \
   > ${TEMPEST_CONFIG_DIR}/tempest.conf
 
-# Install neutron at stable/mitaka because stable/liberty tests will not work
-# because they use an upper contraints file in the installation script that
-# neutron-lbaas uses for tox tests.
-# The file that causes this to happen is: neutron-lbaas/tools/tox_install.sh
-#
-# The use of the liberty version of this file restricts the crpytography
-# library to a low version which is not compatible with newer versions of
-# OpenSSL (1.0.2g+) because of an API change in OpenSSL.
-#
-# See this issue for more details:
-# https://github.com/pyca/cryptography/issues/2750
-#
-# TODO: Make a decision about not using the neutron-lbaas install script
-#       and just installing from requirements files on newest versions
+# Clone neutron-lbaas so we have the tests
 git clone\
   -b ${NEUTRON_LBAAS_BRANCH} \
   --single-branch \