Merge "Move qpid-python to test-requirements"

doc/source/getting_started/standalone.rst

@@ -42,6 +42,7 @@ The localrc looked like this::
   RABBIT_PASSWORD=$MY_PASSWORD
 
   disable_all_services
+  # Alternative RPC backends are zeromq and rabbit
   ENABLED_SERVICES=qpid
   enable_service mysql heat h-api h-api-cfn h-api-cw h-eng
 

requirements.txt

@@ -48,7 +48,6 @@ python-swiftclient>=2.2.0
 python-troveclient>=1.0.9
 python-zaqarclient>=0.1.1
 PyYAML>=3.1.0
-qpid-python;python_version=='2.7'
 requests>=2.5.2
 Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7'
 Routes!=2.0,>=1.12.3;python_version!='2.7'

test-requirements.txt

@@ -14,6 +14,7 @@ PyMySQL>=0.6.2 # MIT License
 oslosphinx>=2.5.0 # Apache-2.0
 oslotest>=1.7.0 # Apache-2.0
 paramiko>=1.13.0
+qpid-python;python_version=='2.7'
 psycopg2
 sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
 testrepository>=0.0.18