Merge ~smoser/cloud-init:cleanup/remove-lxd-pip-install-workarounds into cloud-init:master

[Scott Moser]

tests: remove pip install workarounds for pylxd, take upstream fix.

pylxd upstream provided a fix for the issue we were seeing, so we
can take that fix now rather than having our workarounds to order pip
installs.

The test is that this continues to work:
   rm -Rf .tox/citest
   tox -c tox.ini --recreate --notest -e citest

see commit message

[Chad Smith (chad.smith)]

+1 here, validated that their latest changes (which you pulled in) do fix the dependency conflicts (as they now moved requests out of setup_requires and into install_requires

[Chad Smith (chad.smith)]

review: Approve

[Server Team CI bot (server-team-bot)]

PASSED: Continuous integration, rev:dcf5bd353372f46aa8c068bbf34b8d81e1879b04
https://jenkins.ubuntu.com/server/job/cloud-init-ci/59/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/59/rebuild

review: Approve (continuous-integration)

[Chad Smith (chad.smith)]

An upstream commit landed for this bug.

To view that commit see the following URL:
https://git.launchpad.net/cloud-init/commit/?id=fc23ccc9

diff --git a/integration-requirements.txt b/integration-requirements.txt
index 030c163..e5bb5b2 100644
--- a/integration-requirements.txt
+++ b/integration-requirements.txt
@@ -11,5 +11,10 @@ boto3==1.5.9
 # ssh communication
 paramiko==2.4.0
 
+# lxd backend
+# 04/03/2018: enables use of lxd 3.0
+git+https://github.com/lxc/pylxd.git@4b8ab1802f9aee4eb29cf7b119dae0aa47150779
+
+
 # finds latest image information
 bzr+lp:simplestreams
diff --git a/tox.ini b/tox.ini
index fbc2c88..2fb3209 100644
--- a/tox.ini
+++ b/tox.ini
@@ -134,14 +134,7 @@ deps =
 
 [testenv:citest]
 basepython = python3
-commands =
-    # 06/07/2018: enables use of lxd 3.0 and pre-pip install urllib3==1.22
-    # to avoid contextual version conflicts with pylxd's setup_requires of
-    # pbr which installs latest urllib3 and requests which requires < 1.23.
-    # Install ordered requirements as pylxd has sub-dep conflicts.
-    pip3 install urllib3==1.22
-    pip3 install git+https://github.com/lxc/pylxd.git@1a85a12a23401de6e96b1aeaf59ecbff2e88f49d
-    {envpython} -m tests.cloud_tests {posargs}
+commands = {envpython} -m tests.cloud_tests {posargs}
 passenv = HOME
 deps =
     -r{toxinidir}/integration-requirements.txt