Changed to support Ansible v2

This commit is contained in:
Alejandro Guirao 2015-07-13 15:37:27 +02:00
parent 8efc42d993
commit 6e99023c84

View file

@ -14,12 +14,16 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Ansible. If not, see <http://www.gnu.org/licenses/>. # along with Ansible. If not, see <http://www.gnu.org/licenses/>.
from __future__ import (absolute_import, division, print_function)
__metaclass__ = type
import shelve import shelve
import os import os
from ansible import utils, errors
class LookupModule(object): from ansible.errors import AnsibleError
from ansible.plugins.lookup import LookupBase
class LookupModule(LookupBase):
def __init__(self, basedir=None, **kwargs): def __init__(self, basedir=None, **kwargs):
self.basedir = basedir self.basedir = basedir
@ -33,17 +37,17 @@ class LookupModule(object):
d.close() d.close()
return res return res
def run(self, terms, inject=None, **kwargs): def run(self, terms, variables=None, **kwargs):
terms = utils.listify_lookup_plugin_terms(terms, self.basedir, inject)
ret = []
if not isinstance(terms, list): if not isinstance(terms, list):
terms = [ terms ] terms = [ terms ]
ret = []
for term in terms: for term in terms:
playbook_path = None playbook_path = None
relative_path = None relative_path = None
paramvals = {"file": None, "key": None} paramvals = {"file": None, "key": None}
params = term.split() params = term.split()
@ -55,27 +59,27 @@ class LookupModule(object):
except (ValueError, AssertionError), e: except (ValueError, AssertionError), e:
# In case "file" or "key" are not present # In case "file" or "key" are not present
raise errors.AnsibleError(e) raise AnsibleError(e)
file = paramvals['file'] file = paramvals['file']
key = paramvals['key'] key = paramvals['key']
basedir_path = utils.path_dwim(self.basedir, file) basedir_path = self._loader.path_dwim(file)
# Search also in the role/files directory and in the playbook directory # Search also in the role/files directory and in the playbook directory
if '_original_file' in inject: if 'role_path' in variables:
relative_path = utils.path_dwim_relative(inject['_original_file'], 'files', file, self.basedir, check=False) relative_path = self._loader.path_dwim_relative(variables['role_path'], 'files', file)
if 'playbook_dir' in inject: if 'playbook_dir' in variables:
playbook_path = os.path.join(inject['playbook_dir'], file) playbook_path = self._loader.path_dwim_relative(variables['playbook_dir'],'files', file)
for path in (basedir_path, relative_path, playbook_path): for path in (basedir_path, relative_path, playbook_path):
if path and os.path.exists(path): if path and os.path.exists(path):
res = self.read_shelve(path, key) res = self.read_shelve(path, key)
if res is None: if res is None:
raise errors.AnsibleError("Key %s not found in shelve file %s" % (key, file)) raise AnsibleError("Key %s not found in shelve file %s" % (key, file))
# Convert the value read to string # Convert the value read to string
ret.append(str(res)) ret.append(str(res))
break break
else: else:
raise errors.AnsibleError("Could not locate shelve file in lookup: %s" % file) raise AnsibleError("Could not locate shelve file in lookup: %s" % file)
return ret return ret