Remove unintended master-orientated ansible-role-requirements

This patch removes roles meant for a the master branch only from the
ansible-role-requirements file.

It also adds two search paths for roles in tests/ansible.cfg to ensure that
the bootstrap execution has access to both the pip_install and sshd roles.

Change-Id: Iebde74eace774831372d889a8a1c54389eccbd1d
This commit is contained in:
Jesse Pretorius 2015-12-14 13:31:23 +00:00
parent 3ff56b3a6d
commit 28f75e6326
2 changed files with 1 additions and 21 deletions

View File

@ -9,24 +9,3 @@
version: '1.3'
- src: mattwillsher.sshd
name: sshd
- name: apt_package_pinning
src: https://github.com/openstack/openstack-ansible-apt_package_pinning
version: master
- name: lxc_container_create
src: https://github.com/openstack/openstack-ansible-lxc_container_create
version: master
- name: lxc_hosts
src: https://github.com/openstack/openstack-ansible-lxc_hosts
version: master
- name: openstack_hosts
src: https://github.com/openstack/openstack-ansible-openstack_hosts
version: master
- name: pip_install
src: https://github.com/openstack/openstack-ansible-pip_install
version: master
- name: py_from_git
src: https://github.com/openstack/openstack-ansible-py_from_git
version: master
- name: rsyslog_client
src: https://github.com/openstack/openstack-ansible-rsyslog_client
version: master

View File

@ -2,4 +2,5 @@
action_plugins = ../playbooks/plugins/actions
callback_plugins = ../playbooks/plugins/callbacks
library = ../playbooks/library
roles_path = ../playbooks/roles:/etc/ansible/roles
host_key_checking = False