From 8d2604deecc032146f825dc7b8560736d72dd04e Mon Sep 17 00:00:00 2001 From: "Chandan Kumar (raukadah)" Date: Tue, 3 Mar 2020 16:50:15 +0530 Subject: [PATCH] Use command to set pythonintepreter This commit cherrypick from commit 369396d7ccbf9c1bf1bfb5b9974c26c15025b434 plus additional similiar change in ipaservices-baremetal-ansible.yaml. PythonInterpreter takes string value and let's use $(command -v python3 || command -v python) to find the interpreter value and it does not break existing user interface also. Closes-Bug: 1887146 Change-Id: Ia9c22c535f9a411ec2024ed5a1db911bf85dbf61 Signed-off-by: Chandan Kumar (raukadah) (cherry picked from commit 369396d7ccbf9c1bf1bfb5b9974c26c15025b434) --- deployment/ipa/ipaclient-baremetal-ansible.yaml | 2 +- deployment/ipa/ipaservices-baremetal-ansible.yaml | 2 +- deployment/neutron/neutron-ovs-agent-container-puppet.yaml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/deployment/ipa/ipaclient-baremetal-ansible.yaml b/deployment/ipa/ipaclient-baremetal-ansible.yaml index d8dbedaec1..e30b72eb99 100644 --- a/deployment/ipa/ipaclient-baremetal-ansible.yaml +++ b/deployment/ipa/ipaclient-baremetal-ansible.yaml @@ -35,7 +35,7 @@ parameters: PythonInterpreter: type: string description: The python interpreter to use for python and ansible actions - default: /usr/bin/python + default: "$(command -v python3 || command -v python)" MakeHomeDir: type: boolean description: Configure PAM to create a users home directory if it does not exist. diff --git a/deployment/ipa/ipaservices-baremetal-ansible.yaml b/deployment/ipa/ipaservices-baremetal-ansible.yaml index 2583249456..b042171f9c 100644 --- a/deployment/ipa/ipaservices-baremetal-ansible.yaml +++ b/deployment/ipa/ipaservices-baremetal-ansible.yaml @@ -35,7 +35,7 @@ parameters: PythonInterpreter: type: string description: The python interpreter to use for python and ansible actions - default: "/usr/bin/python" + default: "$(command -v python3 || command -v python)" IdMDomain: default: '' description: IDM domain to register IDM client. Typically, this is discovered diff --git a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml index 06efb29aab..26dff5a96d 100644 --- a/deployment/neutron/neutron-ovs-agent-container-puppet.yaml +++ b/deployment/neutron/neutron-ovs-agent-container-puppet.yaml @@ -58,7 +58,7 @@ parameters: PythonInterpreter: type: string description: The python interpreter to use for python and ansible actions - default: /usr/bin/python + default: "$(command -v python3 || command -v python)" NeutronEnableL2Pop: type: string description: Enable/disable the L2 population feature in the Neutron agents.