openstack/openstack-ansible-tests
Code Issues Proposed changes

Add test-install-openstack-hosts to test-prepare-host

Browse Source 
The test-install-openstack-hosts.yml playbook was only being used by
the openstack_hosts role, being that this is a common setup task used in
various tests this playbook is now being included in the
"test-prepare-host.yml" playbook.

Change-Id: I52cb3f57570f56a9d65efd291945d14b2e729ee6
This commit is contained in:
Andy McCrae 2016-09-21 14:09:28 +01:00 committed by Kevin Carter
parent 877ad880ef
commit 29f507927e
No known key found for this signature in database
GPG Key ID: 69FEFFC5E2D9273F
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
test-prepare-host.yml
View File

@ -13,10 +13,9 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
- name: Playbook for configuring the LXC host - name: Playbook for configuring hosts
hosts: localhost hosts: localhost
pre_tasks: pre_tasks:
- include: "common-tasks/test-force-package-cache-update.yml"
- include: "common-tasks/test-set-nodepool-vars.yml" - include: "common-tasks/test-set-nodepool-vars.yml"
- name: Clear iptables rules - name: Clear iptables rules
shell: "{{ playbook_dir }}/iptables-clear.sh" shell: "{{ playbook_dir }}/iptables-clear.sh"
@ -27,8 +26,12 @@
user: root user: root
key: "{{ hostvars['localhost']['lxc_container_ssh_key'] }}" key: "{{ hostvars['localhost']['lxc_container_ssh_key'] }}"
manage_dir: no manage_dir: no
- include: test-install-openstack-hosts.yml
- name: Playbook for configuring the LXC host
hosts: localhost
roles: roles:
- role: "openstack_hosts"
- role: "lxc_hosts" - role: "lxc_hosts"
lxc_net_address: 10.100.100.1 lxc_net_address: 10.100.100.1
lxc_net_dhcp_range: 10.100.100.8,10.100.100.253 lxc_net_dhcp_range: 10.100.100.8,10.100.100.253