From: Jan Benedikt <j.benedikt@partner.samsung.com>
Date: Mon, 17 Feb 2020 08:26:54 +0000 (+0100)
Subject: Specify Python in Ansible inventory template file
X-Git-Tag: 6.0.0-ONAP~40^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=255d066ef39b24fc0da8776ee7aaefedc4b812e7;p=oom%2Foffline-installer.git

Specify Python in Ansible inventory template file

Created copy of inventory template due to set var of Python interpreter.
Python interpreter cannot be set in ansible.cfg file due to bug:
https://github.com/ansible/ansible/issues/45852

Issue-ID: OOM-1671
Signed-off-by: Jan Benedikt <j.benedikt@partner.samsung.com>
Change-Id: I9683a2a764e8c6696a39625a6ddc40cda20f9333
---

diff --git a/ansible/ansible.cfg b/ansible/ansible.cfg
index 0978b814..b92f885f 100644
--- a/ansible/ansible.cfg
+++ b/ansible/ansible.cfg
@@ -1,9 +1,9 @@
 [defaults]
-
 # Define any custom roles used by applications installed by installer
 # this parameter is telling ansible what additional folder it should
 # browse while looking up for roles code
 # relative path ./application is mapped into ansible container under
 # /ansible/application where application roles should be found
 roles_path = /ansible/application
+# Set log file
 log_path = /ansible/log/ansible.log
diff --git a/tools/cicdansible/roles/install/tasks/install.yml b/tools/cicdansible/roles/install/tasks/install.yml
index 529e2acf..5c4bcd81 100644
--- a/tools/cicdansible/roles/install/tasks/install.yml
+++ b/tools/cicdansible/roles/install/tasks/install.yml
@@ -14,7 +14,7 @@
   unarchive:
     src: "resources/{{ hostvars[groups['resources'][0]].resources_sw_filename }}"
     dest: "{{ installer_deploy_path }}"
-#Generate ansible inventory and extra vars.
+#Generate ansible inventory and extra vars
 - name: "Generate ansible inventory for installer"
   template:
     src: inventory.yml.j2
diff --git a/tools/cicdansible/roles/install/templates/inventory.yml.j2 b/tools/cicdansible/roles/install/templates/inventory.yml.j2
index faec5903..9f7e08f8 100644
--- a/tools/cicdansible/roles/install/templates/inventory.yml.j2
+++ b/tools/cicdansible/roles/install/templates/inventory.yml.j2
@@ -1,5 +1,8 @@
 all:
   vars:
+{% if hostvars['infra'].ansible_distribution in ["Debian","Ubuntu"] %}
+    ansible_python_interpreter: "/usr/bin/python3"
+{% endif %}
     ansible_ssh_private_key_file: /root/.ssh/id_rsa
     ansible_ssh_common_args: "-o StrictHostKeyChecking=no"
   children: