From 5179514e0c9512816b7a73dc094c2e32246d5b8d Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Mon, 29 Jul 2019 12:33:25 +0200
Subject: [PATCH] ansible-ipa-*-install: Use /usr/bin/python by default, fix
_install_packages
/usr/bin/python should be used by default. Fixed typo in _install_packages
setting in the inventory file.
---
utils/ansible-ipa-client-install | 4 ++--
utils/ansible-ipa-replica-install | 4 ++--
utils/ansible-ipa-server-install | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/utils/ansible-ipa-client-install b/utils/ansible-ipa-client-install
index f074e166..8ebfa3a2 100755
--- a/utils/ansible-ipa-client-install
+++ b/utils/ansible-ipa-client-install
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -330,7 +330,7 @@ def main(options, args):
f.write("ipaclient_allow_repair=%s\n" %
options.ipaclient_allow_repair)
if options.ipaclient_install_packages:
- f.write("ipaclient_install-packages=%s\n" %
+ f.write("ipaclient_install_packages=%s\n" %
options.ipaclient_install_packages)
if options.uninstall:
diff --git a/utils/ansible-ipa-replica-install b/utils/ansible-ipa-replica-install
index 5c8eab49..1d131253 100755
--- a/utils/ansible-ipa-replica-install
+++ b/utils/ansible-ipa-replica-install
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -445,7 +445,7 @@ def main(options, args):
options.secondary_rid_base)
# ansible
if options.ipareplica_install_packages:
- f.write("ipareplica_install-packages=%s\n" %
+ f.write("ipareplica_install_packages=%s\n" %
options.ipareplica_install_packages)
if options.ipareplica_setup_firewalld:
f.write("ipareplica_setup_firewalld=%s\n" %
diff --git a/utils/ansible-ipa-server-install b/utils/ansible-ipa-server-install
index 299adebd..e1ab3d4d 100755
--- a/utils/ansible-ipa-server-install
+++ b/utils/ansible-ipa-server-install
@@ -1,4 +1,4 @@
-#!/usr/bin/python3
+#!/usr/bin/python
# -*- coding: utf-8 -*-
# Authors:
@@ -493,7 +493,7 @@ def main(options, args):
f.write("ipaserver_ignore_last_of_role=yes\n")
# ansible
if options.ipaserver_install_packages:
- f.write("ipaserver_install-packages=%s\n" %
+ f.write("ipaserver_install_packages=%s\n" %
options.ipaserver_install_packages)
if options.ipaserver_setup_firewalld:
f.write("ipaserver_setup_firewalld=%s\n" %
--
GitLab