Make possible to use ansible 2.4

Ansible 2.4 has changed the interface for var plugins.
Our vars plugin shouldn't be used in ansible 2.4, because the
features we were looking for are now standard.

However the plugin is still shipped. So we need to ensure
this vars plugin doesn't get loaded on ansible 2.4.

Ansible will not load a vars plugin in its plugin location
if no VarsModule is defined. This commit abuses this
mechanism to conditionally load the vars module depending on
the version, at the expense of throwing a warning in
Ansible 2.4.

Change-Id: I6e57b64c767bc0c761d61f5f5b07da4f85f1ad08
This commit is contained in:
Jean-Philippe Evrard 2017-11-02 13:51:30 +00:00
parent 6a64c8e7db
commit ad91b1a12b
1 changed files with 54 additions and 52 deletions

View File

@ -28,6 +28,8 @@ except ImportError:
from ansible.parsing.dataloader import DataLoader from ansible.parsing.dataloader import DataLoader
from ansible.utils.vars import merge_hash from ansible.utils.vars import merge_hash
from ansible import __version__ as ansible_version
from distutils.version import LooseVersion
def vars_files_loading(folder, name, matched=False): def vars_files_loading(folder, name, matched=False):
@ -47,63 +49,63 @@ def vars_files_loading(folder, name, matched=False):
files.extend(vars_files_loading(f, name, matched=True)) files.extend(vars_files_loading(f, name, matched=True))
return sorted(files) return sorted(files)
if LooseVersion(ansible_version) < LooseVersion('2.4.0'):
class VarsModule(object): class VarsModule(object):
""" """
Loads variables for groups and/or hosts Loads variables for groups and/or hosts
"""
def __init__(self, inventory):
""" constructor """
self.inventory = inventory
self.inventory_basedir = inventory.basedir()
self.grp_vars_string = os.environ.get(
'GROUP_VARS_PATH', '/etc/openstack_deploy/group_vars')
self.grp_vars_folders = self.grp_vars_string.split(":")
self.host_vars_string = os.environ.get(
'HOST_VARS_PATH', '/etc/openstack_deploy/host_vars')
self.host_vars_folders = self.host_vars_string.split(":")
def run(self, host, vault_password=None):
""" This function is only used for backwards compatibility with ansible1.
We don't need to handle this case.
""" """
return {}
def get_host_vars(self, host, vault_password=None): def __init__(self, inventory):
""" Get host specific variables. """ """ constructor """
resulting_host_vars = {}
var_files = []
for host_var_folder in self.host_vars_folders: self.inventory = inventory
var_files.extend(vars_files_loading(host_var_folder, host.name)) self.inventory_basedir = inventory.basedir()
self.grp_vars_string = os.environ.get(
'GROUP_VARS_PATH', '/etc/openstack_deploy/group_vars')
self.grp_vars_folders = self.grp_vars_string.split(":")
self.host_vars_string = os.environ.get(
'HOST_VARS_PATH', '/etc/openstack_deploy/host_vars')
self.host_vars_folders = self.host_vars_string.split(":")
_dataloader = DataLoader() def run(self, host, vault_password=None):
_dataloader.set_vault_password(vault_password) """ This function is only used for backwards compatibility with ansible1.
for filename in var_files: We don't need to handle this case.
display.vvvvv( """
"Hostname {}: Loading var file {}".format(host.name, filename)) return {}
data = _dataloader.load_from_file(filename)
if data is not None:
resulting_host_vars = merge_hash(resulting_host_vars, data)
return resulting_host_vars
def get_group_vars(self, group, vault_password=None): def get_host_vars(self, host, vault_password=None):
""" Get group specific variables. """ """ Get host specific variables. """
resulting_host_vars = {}
var_files = []
resulting_group_vars = {} for host_var_folder in self.host_vars_folders:
var_files = [] var_files.extend(vars_files_loading(host_var_folder, host.name))
for grp_var_folder in self.grp_vars_folders: _dataloader = DataLoader()
var_files.extend(vars_files_loading(grp_var_folder, group.name)) _dataloader.set_vault_password(vault_password)
for filename in var_files:
display.vvvvv(
"Hostname {}: Loading var file {}".format(host.name, filename))
data = _dataloader.load_from_file(filename)
if data is not None:
resulting_host_vars = merge_hash(resulting_host_vars, data)
return resulting_host_vars
_dataloader = DataLoader() def get_group_vars(self, group, vault_password=None):
_dataloader.set_vault_password(vault_password) """ Get group specific variables. """
for filename in var_files:
display.vvvvv( resulting_group_vars = {}
"Group {}: Loading var file {}".format(group.name, filename)) var_files = []
data = _dataloader.load_from_file(filename)
if data is not None: for grp_var_folder in self.grp_vars_folders:
resulting_group_vars = merge_hash(resulting_group_vars, data) var_files.extend(vars_files_loading(grp_var_folder, group.name))
return resulting_group_vars
_dataloader = DataLoader()
_dataloader.set_vault_password(vault_password)
for filename in var_files:
display.vvvvv(
"Group {}: Loading var file {}".format(group.name, filename))
data = _dataloader.load_from_file(filename)
if data is not None:
resulting_group_vars = merge_hash(resulting_group_vars, data)
return resulting_group_vars