Change Ansible charm interpreter to python3

[osm/devops.git] / descriptor-packages / tools / charm-generator / generator / ansible-charm / templates / ansible_lib.py.j2

diff --git a/descriptor-packages/tools/charm-generator/generator/ansible-charm/templates/ansible_lib.py.j2 b/descriptor-packages/tools/charm-generator/generator/ansible-charm/templates/ansible_lib.py.j2
index 9da7402..afbf162 100644 (file)
--- a/descriptor-packages/tools/charm-generator/generator/ansible-charm/templates/ansible_lib.py.j2
+++ b/descriptor-packages/tools/charm-generator/generator/ansible-charm/templates/ansible_lib.py.j2
@@ -49,6 +49,7 @@ def create_hosts(cfg, hosts):
     with open(inventory_path, 'w') as f:
         f.write('[{}]\n'.format(hosts))
         h1 = '{0} ansible_connection=ssh ansible_ssh_user={1} ansible_ssh_pass={2} ' \
+             'ansible_ssh_private_key_file=~/.ssh/id_juju_sshproxy ' \
              'ansible_python_interpreter=/usr/bin/python3\n'.format(cfg['ssh-hostname'], cfg['ssh-username'],
                                                                     cfg['ssh-password'])
         f.write(h1)
@@ -60,6 +61,12 @@ def create_ansible_cfg():
     with open(ansible_config_path, 'w') as f:
         f.write('[defaults]\n')
         f.write('host_key_checking = False\n')
+        # logs playbook execution attempts to the specified path
+        f.write('log_path = /var/log/ansible.log\n')
+
+        f.write('[ssh_connection]\n')
+        f.write('control_path=%(directory)s/%%h-%%r\n')
+        f.write('control_path_dir=~/.ansible/cp\n')
 
 
 # Function to find the playbook path