Prepare containers with openstack-hosts role

The commit [1] allowed repo management for all
hosts where openstack_hosts is applied, and commit [2] removed
UCA from pip install, which applies to all the hosts,
whether they are containers or not.
We should therefore add UCA to containers back.

[1]: https://review.openstack.org/#/c/515399
[2]: https://review.openstack.org/#/c/515400

Change-Id: I79ff70c438b44753be2a93f004ebbc46de0a963d
This commit is contained in:
Jean-Philippe Evrard 2017-12-04 09:52:49 +00:00
parent 8fc92038f1
commit 5eea959ca9

View File

@ -17,6 +17,8 @@
hosts: localhost hosts: localhost
become: true become: true
gather_facts: true gather_facts: true
tasks:
- include: "common-tasks/test-set-nodepool-vars.yml"
- include: destroy_containers.yml - include: destroy_containers.yml
when: destroy_first | default(True) | bool when: destroy_first | default(True) | bool
@ -27,9 +29,10 @@
become: True become: True
gather_facts: False gather_facts: False
any_errors_fatal: true any_errors_fatal: true
roles: tasks:
- role: "lxc_container_create" - name: Create containers
post_tasks: include_role:
name: "lxc_container_create"
- name: Wait for container connectivity - name: Wait for container connectivity
wait_for_connection: wait_for_connection:
connect_timeout: "{{ lxc_container_wait_params.connect_timeout | default(omit) }}" connect_timeout: "{{ lxc_container_wait_params.connect_timeout | default(omit) }}"
@ -38,3 +41,18 @@
timeout: "{{ lxc_container_wait_params.timeout | default(omit) }}" timeout: "{{ lxc_container_wait_params.timeout | default(omit) }}"
vars_files: vars_files:
- test-vars.yml - test-vars.yml
# TODO(evrardjp): Move this as an include_role above like the patch
# https://review.openstack.org/525109
# when https://review.openstack.org/#/c/521598 is in,
# to optimize serialization
- name: Execute the openstack-host role on containers
hosts: all_containers
become: true
gather_facts: true
pre_tasks:
- include: "common-tasks/test-set-nodepool-vars.yml"
roles:
- role: "openstack_hosts"
vars_files:
- test-vars.yml