openstack/openstack-ansible-lxc_hosts
Code Issues Proposed changes

Merge "Change include: to include_tasks:"

Browse Source
This commit is contained in:
Zuul 2018-02-15 15:29:32 +00:00 committed by Gerrit Code Review
commit 02f2a6bf7d
8 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tasks/lxc_cache.yml
View File

@ -40,13 +40,13 @@
tags:
- always
- include: lxc_cache_preparation.yml
- include_tasks: lxc_cache_preparation.yml
when:
- lxc_image_cache_refresh | bool
tags:
- lxc_hosts-config
- include: lxc_cache_create.yml
- include_tasks: lxc_cache_create.yml
when:
- lxc_image_cache_refresh | bool
tags:

3
tasks/lxc_cache_create.yml
View File

@ -78,8 +78,7 @@
content: "{{ cache_time }}"
dest: "{{ cache_path_fact }}/build_id"
- include: "{{ item }}"
static: no
- include_tasks: "{{ item }}"
with_first_found:
- files:
- "lxc_container_{{ lxc_container_backing_store | default('None') }}.yml"

2
tasks/lxc_cache_preparation.yml
View File

@ -46,7 +46,7 @@
when:
- (deployment_environment_variables | default({})).keys() | length > 0
- include: "lxc_cache_preparation_systemd_{{ (systemd_version.stdout_lines[0].split()[-1] | int > 219) | ternary('new', 'old') }}.yml"
- include_tasks: "lxc_cache_preparation_systemd_{{ (systemd_version.stdout_lines[0].split()[-1] | int > 219) | ternary('new', 'old') }}.yml"
- block:
- name: Generate apt keys from LXC host for the container cache

2
tasks/lxc_install.yml
View File

@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
- include: "lxc_install_{{ ansible_pkg_mgr }}.yml"
- include_tasks: "lxc_install_{{ ansible_pkg_mgr }}.yml"
tags:
- install-apt
- install-yum

2
tasks/lxc_install_apt.yml
View File

@ -49,7 +49,7 @@
- lxc-irqbalance
- lxc_hosts-config
- include: lxc_apparmor.yml
- include_tasks: lxc_apparmor.yml
- name: Flush handler to reload apparmor profiles
meta: flush_handlers

2
tasks/lxc_install_zypper.yml
View File

@ -50,7 +50,7 @@
- lxc-files
- lxc_hosts-config
- include: lxc_apparmor.yml
- include_tasks: lxc_apparmor.yml
- name: Flush handler to reload apparmor profiles
meta: flush_handlers

2
tasks/lxc_post_install.yml
View File

@ -127,7 +127,7 @@
# Ensure apparmor reindex runs before other things that may fail
- meta: flush_handlers
- include: lxc_selinux.yml
- include_tasks: lxc_selinux.yml
when:
- ansible_selinux.status is defined
- ansible_selinux.status == "enabled"

14
tasks/main.yml
View File

@ -42,31 +42,31 @@
tags:
- always
- include: lxc_pre_install.yml
- include_tasks: lxc_pre_install.yml
tags:
- lxc_hosts-install
- include: lxc_install.yml
- include_tasks: lxc_install.yml
tags:
- lxc_hosts-install
- include: lxc_cache_prestage.yml
- include_tasks: lxc_cache_prestage.yml
tags:
- lxc_hosts-config
- include: lxc_post_install.yml
- include_tasks: lxc_post_install.yml
tags:
- lxc_hosts-config
- include: lxc_kernel_tuning.yml
- include_tasks: lxc_kernel_tuning.yml
tags:
- lxc_hosts-config
- include: lxc_net.yml
- include_tasks: lxc_net.yml
tags:
- lxc_hosts-config
- include: lxc_cache.yml
- include_tasks: lxc_cache.yml
tags:
- lxc_hosts-install
- lxc_hosts-config