From b7e7ad6d99337c916f58b7cef571b89c4648b60f Mon Sep 17 00:00:00 2001
From: zhaoxinyu <zhaoxinyu@huawei.com>
Date: Tue, 20 May 2014 00:43:47 +0000
Subject: [PATCH] Bump up mgmt ip start to avoid conflict with compass server

now start from *.*.*.10 but test slaves where compass server
is can be out of 10 so a conflict might happen, so increase
to 50.
pin pycrypto version to 2.0.1 and below
Keystone client grizzly version only work with pycrypto below 2.0.1,
so pin pycrypto to 2.0.1 and below.
Closes-Bug: 1321032
Closes-Bug: 1321056
Change-Id: I2f72937ee128d34ce2eb02f35edff700eab686a5
---
 regtest/regtest.conf  | 2 +-
 test-requirements.txt | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/regtest/regtest.conf b/regtest/regtest.conf
index c34e033d..032b6aeb 100644
--- a/regtest/regtest.conf
+++ b/regtest/regtest.conf
@@ -11,7 +11,7 @@ export USE_POLL_SWITCHES=${USE_POLL_SWITCHES:-true}
 
 export HOST_ROLES=${HOST_ROLES:-''}
 
-export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-`echo $ipaddr |cut -d. -f'1 2 3'`.10}
+export MANAGEMENT_IP_START=${MANAGEMENT_IP_START:-`echo $ipaddr |cut -d. -f'1 2 3'`.50}
 export MANAGEMENT_IP_END=${MANAGEMENT_IP_END:-`echo $ipaddr |cut -d. -f'1 2 3'`.100}
 export MANAGEMENT_NETMASK=${MANAGEMENT_NETMASK:-'255.255.255.0'}
 export MANAGEMENT_NIC=${MANAGEMENT_NIC:-'eth0'}
diff --git a/test-requirements.txt b/test-requirements.txt
index 406995e0..eac30daf 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -6,3 +6,4 @@ testrepository>=0.0.17
 mimeparse
 coverage>=3.6
 hacking>=0.8.0,<0.9
+pycrypto<=2.0.1