Merge "Fix incorrect ansible_library path"

openstack-archive · Jan 26, 2016 · 2681a5f · 2681a5f
2 parents 2164e76 + acaa8df
commit 2681a5f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/solar/core/handlers/ansible_playbook.py b/solar/core/handlers/ansible_playbook.py
@@ -94,10 +94,16 @@ def action(self, resource, action):
         remote_extra_vars_file = extra_vars_file.replace(
             SOLAR_TEMP_LOCAL_LOCATION, '/tmp/')
 
-        call_args = ['ansible-playbook', '--module-path', '/tmp/library',
-                     '-i', remote_inventory_file,
-                     '--extra-vars', '@%s' % remote_extra_vars_file,
-                     remote_playbook_file]
+        call_args = [
+            'ansible-playbook',
+            '--module-path',
+            '/tmp/ansible_library',
+            '-i',
+            remote_inventory_file,
+            '--extra-vars',
+            '@%s' % remote_extra_vars_file,
+            remote_playbook_file
+        ]
         log.debug('EXECUTING: %s', ' '.join(call_args))
 
         rst = self.transport_run.run(resource, *call_args)

diff --git a/solar/core/handlers/ansible_template.py b/solar/core/handlers/ansible_template.py
@@ -76,8 +76,14 @@ def action(self, resource, action_name):
         remote_inventory_file = inventory_file.replace(
             SOLAR_TEMP_LOCAL_LOCATION, '/tmp/')
 
-        call_args = ['ansible-playbook', '--module-path', '/tmp/library',
-                     '-i', remote_inventory_file, remote_playbook_file]
+        call_args = [
+            'ansible-playbook',
+            '--module-path',
+            '/tmp/ansible_library',
+            '-i',
+            remote_inventory_file,
+            remote_playbook_file
+        ]
         log.debug('EXECUTING: %s', ' '.join(call_args))
 
         rst = self.transport_run.run(resource, *call_args)