From e2b0bd2741024cc816ff3e0f311db65b7f598ff0 Mon Sep 17 00:00:00 2001 From: Andrew Woodward Date: Thu, 16 Apr 2015 15:50:02 -0700 Subject: [PATCH] Make paths in ansible extention fully qualified --- config.yml | 2 ++ solar/solar/extensions/modules/ansible.py | 13 ++++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/config.yml b/config.yml index 9ccab955..400e4590 100644 --- a/config.yml +++ b/config.yml @@ -1,3 +1,5 @@ +tmp: /vagrant/tmp + examples-dir: /vagrant/examples extensions-dir: /vagrant/solar/solar/extensions diff --git a/solar/solar/extensions/modules/ansible.py b/solar/solar/extensions/modules/ansible.py index f311a032..8dceedcd 100644 --- a/solar/solar/extensions/modules/ansible.py +++ b/solar/solar/extensions/modules/ansible.py @@ -22,6 +22,7 @@ ANSIBLE_INVENTORY = """ {% endfor %} """ +BASE_PATH=utils.read_config()['tmp'] def playbook(resource_path, playbook_name): resource_dir = os.path.dirname(resource_path) @@ -158,9 +159,9 @@ class AnsibleOrchestration(base.BaseExtension): return result def configure(self, profile_action='run', actions=None): - utils.create_dir('tmp/group_vars') - utils.write_to_file(self.inventory, 'tmp/hosts') - utils.yaml_dump_to(self.vars, 'tmp/group_vars/all') + utils.create_dir(BASE_PATH + '/group_vars') + utils.write_to_file(self.inventory, BASE_PATH + '/hosts') + utils.yaml_dump_to(self.vars, BASE_PATH + '/group_vars/all') if actions: prepared = self.prepare_many(actions) @@ -170,9 +171,11 @@ class AnsibleOrchestration(base.BaseExtension): raise Exception('Either profile_action ' 'or actions should be provided.') - utils.yaml_dump_to(prepared, 'tmp/main.yml') + utils.yaml_dump_to(prepared, BASE_PATH + '/main.yml') sub = subprocess.Popen( - ['ansible-playbook', '-i', 'tmp/hosts', 'tmp/main.yml'], + ['ansible-playbook', '-i', + BASE_PATH + '/hosts', + BASE_PATH + '/main.yml'], env=dict(os.environ, ANSIBLE_HOST_KEY_CHECKING='False')) out, err = sub.communicate()