Role tests should test against the same branch

All dependent roles used in testing must be the
same branch as the role under test.

The py_from_git role is removed as it is no longer required.

Change-Id: Iaf4dcd2b317394c41e7d774abde50d3548fc117f

tests/ansible-role-requirements.yml

@@ -1,28 +1,24 @@
 - name: apt_package_pinning
   src: https://git.openstack.org/openstack/openstack-ansible-apt_package_pinning
   scm: git
-  version: master
+  version: origin/stable/mitaka
 - name: pip_install
   src: https://git.openstack.org/openstack/openstack-ansible-pip_install
   scm: git
-  version: master
-- name: py_from_git
-  src: https://git.openstack.org/openstack/openstack-ansible-py_from_git
-  scm: git
-  version: master
+  version: origin/stable/mitaka
 - name: lxc_hosts
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
   scm: git
-  version: master
+  version: origin/stable/mitaka
 - name: lxc_container_create
   src: https://git.openstack.org/openstack/openstack-ansible-lxc_container_create
   scm: git
-  version: master
+  version: origin/stable/mitaka
 - name: openstack_hosts
   src: https://git.openstack.org/openstack/openstack-ansible-openstack_hosts
   scm: git
-  version: master
+  version: origin/stable/mitaka
 - name: galera_client
   src: https://git.openstack.org/openstack/openstack-ansible-galera_client
   scm: git
-  version: master
+  version: origin/stable/mitaka

tests/test-prep.yml

@@ -74,15 +74,7 @@
           name: "trusty.tgz"
           sha256sum: "56c6a6e132ea7d10be2f3e8104f47136ccf408b30e362133f0dc4a0a9adb4d0c"
           chroot_path: trusty/rootfs-amd64
-    - role: "py_from_git"
-      git_repo: "https://github.com/lxc/python2-lxc"
-      git_dest: "/opt/lxc_python2"
-      git_install_branch: "master"
   post_tasks:
-    # THIS TASK IS ONLY BEING DONE BECAUSE THE TOX SHARED LXC LIB IS NOT USABLE ON A
-    #  HOST MACHINE THAT MAY NOT HAVE ACCESS TO THE VENV.
-    - name: Ensure the lxc lib is on the host
-      command: /usr/local/bin/pip install /opt/lxc_python2
     # Inventory is being pre-loaded using a post tasks instead of through a dynamic
     #  inventory system. While this is not a usual method for deployment it's being
     #  done for functional testing.