openstack
/
openstack-ansible-lxc_hosts
Code Issues Proposed changes

Do not use 'null' when trying to locate vars files 

This generates warnings in the ansible log

Change-Id: I66e6f2dc83938f05b6913a6500b292416b592793
This commit is contained in:
Jonathan Rosser 2019-05-04 14:43:07 -06:00
parent af76d49905
commit a39665eef1
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
defaults/main.yml
View File

@ -173,7 +173,7 @@ lxc_cache_prep_post_commands: '## post command skipped ##'
# or by providing the full path to a local file containing all of the variables
# needed to prepare a container. built-in supported values are:
# [redhat-7.yml, suse-42.yml, ubuntu-16.04.yml, ubuntu-18.04.yml]
lxc_user_defined_container: null
#lxc_user_defined_container: null
# Full path to the base image prep script. By default this will use the
# named script for a given OS within the "templates/prep-scripts" directory.

2
tasks/main.yml
View File

@ -45,7 +45,7 @@
- name: Gather container variables
include_vars: "{{ item }}"
with_first_found:
- "{{ lxc_user_defined_container }}"
- "{{ lxc_user_defined_container | default([]) }}"
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_version | lower }}.yml"
- "{{ ansible_distribution | lower }}-{{ ansible_distribution_major_version | lower }}.yml"
- "{{ ansible_os_family | lower }}-{{ ansible_distribution_major_version | lower }}.yml"