From f4680ceb5acaf8fd3e39e3929e19e71cd2696bb9 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Thu, 15 Aug 2019 21:29:03 +0200
Subject: [PATCH] utils/ansible-ipa-[server,replica,client]-install: New
--ansible-verbose option
This option defines the verbose level for the internal ansible-playbook
run.
---
utils/ansible-ipa-client-install | 12 +++++++++++-
utils/ansible-ipa-replica-install | 12 +++++++++++-
utils/ansible-ipa-server-install | 12 +++++++++++-
3 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/utils/ansible-ipa-client-install b/utils/ansible-ipa-client-install
index 373d29f3..7b0482a9 100755
--- a/utils/ansible-ipa-client-install
+++ b/utils/ansible-ipa-client-install
@@ -214,6 +214,12 @@ def parse_options():
help="privilege escalation method to use "
"(default=sudo), use `ansible-doc -t become -l` to "
"list valid choices.")
+ parser.add_argument("--ansible-verbose",
+ dest="ansible_verbose",
+ type=int, default=None,
+ help="privilege escalation method to use "
+ "(default=sudo), use `ansible-doc -t become -l` to "
+ "list valid choices.")
options, args = parser.parse_known_args()
@@ -373,8 +379,12 @@ def main(options, args):
f.write(" - role: ipaclient\n")
f.write(" state: %s\n" % state)
+ cmd = [ 'ansible-playbook' ]
+ if options.ansible_verbose:
+ cmd.append("-"+"v"*options.ansible_verbose)
+ cmd.extend(['-i', inventory, playbook])
try:
- returncode = run_cmd(['ansible-playbook', '-i', inventory, playbook])
+ returncode = run_cmd(cmd)
if returncode != 0:
raise RuntimeError()
finally:
diff --git a/utils/ansible-ipa-replica-install b/utils/ansible-ipa-replica-install
index 68cbead6..0d9d0e22 100755
--- a/utils/ansible-ipa-replica-install
+++ b/utils/ansible-ipa-replica-install
@@ -284,6 +284,12 @@ def parse_options():
help="privilege escalation method to use "
"(default=sudo), use `ansible-doc -t become -l` to "
"list valid choices.")
+ parser.add_argument("--ansible-verbose",
+ dest="ansible_verbose",
+ type=int, default=None,
+ help="privilege escalation method to use "
+ "(default=sudo), use `ansible-doc -t become -l` to "
+ "list valid choices.")
options, args = parser.parse_known_args()
@@ -489,8 +495,12 @@ def main(options, args):
f.write(" - role: ipareplica\n")
f.write(" state: %s\n" % state)
+ cmd = [ 'ansible-playbook' ]
+ if options.ansible_verbose:
+ cmd.append("-"+"v"*options.ansible_verbose)
+ cmd.extend(['-i', inventory, playbook])
try:
- returncode = run_cmd(['ansible-playbook', '-i', inventory, playbook])
+ returncode = run_cmd(cmd)
if returncode != 0:
raise RuntimeError()
finally:
diff --git a/utils/ansible-ipa-server-install b/utils/ansible-ipa-server-install
index 89b93d56..62e75951 100755
--- a/utils/ansible-ipa-server-install
+++ b/utils/ansible-ipa-server-install
@@ -323,6 +323,12 @@ def parse_options():
help="privilege escalation method to use "
"(default=sudo), use `ansible-doc -t become -l` to "
"list valid choices.")
+ parser.add_argument("--ansible-verbose",
+ dest="ansible_verbose",
+ type=int, default=None,
+ help="privilege escalation method to use "
+ "(default=sudo), use `ansible-doc -t become -l` to "
+ "list valid choices.")
options, args = parser.parse_known_args()
@@ -549,8 +555,12 @@ def main(options, args):
f.write(" - role: ipaserver\n")
f.write(" state: %s\n" % state)
+ cmd = [ 'ansible-playbook' ]
+ if options.ansible_verbose:
+ cmd.append("-"+"v"*options.ansible_verbose)
+ cmd.extend(['-i', inventory, playbook])
try:
- returncode = run_cmd(['ansible-playbook', '-i', inventory, playbook])
+ returncode = run_cmd(cmd)
if returncode != 0:
raise RuntimeError()
finally:
--
GitLab