Skip to content

Commit

Permalink
Merge "Remove py_from_git role"
Browse files Browse the repository at this point in the history
  • Loading branch information
Jenkins authored and openstack-gerrit committed May 5, 2016
2 parents 7df31be + 75c2484 commit 47088f7
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 18 deletions.
4 changes: 0 additions & 4 deletions tests/ansible-role-requirements.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@
src: https://git.openstack.org/openstack/openstack-ansible-memcached_server
scm: git
version: master
- name: py_from_git
src: https://git.openstack.org/openstack/openstack-ansible-py_from_git
scm: git
version: master
- name: lxc_hosts
src: https://git.openstack.org/openstack/openstack-ansible-lxc_hosts
scm: git
Expand Down
15 changes: 1 addition & 14 deletions tests/test-prep.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,20 +59,7 @@
name: "trusty.tgz"
sha256sum: "56c6a6e132ea7d10be2f3e8104f47136ccf408b30e362133f0dc4a0a9adb4d0c"
chroot_path: trusty/rootfs-amd64
# The $HOME directory is mocked to work with tox
# by defining the 'ansible_env' hash. This should
# NEVER be done outside of testing.
ansible_env: ## NEVER DO THIS OUTSIDE OF TESTING
HOME: "/tmp"
- 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.
Expand All @@ -96,4 +83,4 @@
container_name: "{{ item.name }}"
with_items:
- { name: "service1", service: "service1", address: "10.100.100.101", groups: "all,all_containers,rabbitmq_all,galera_all,service_all" }
- { name: "openstack1", service: "openstack1", address: "10.100.100.102", groups: "all,all_containers,heat_all,heat_api,heat_engine,heat_api_cfn,heat_api_cloudwatch,heat_engine_container,heat_apis_container,keystone_all" }
- { name: "openstack1", service: "openstack1", address: "10.100.100.102", groups: "all,all_containers,heat_all,heat_api,heat_engine,heat_api_cfn,heat_api_cloudwatch,heat_engine_container,heat_apis_container,keystone_all" }

0 comments on commit 47088f7

Please sign in to comment.