From 7b51df6c335fbd61bc2bdc0cb56a68cf9bddfa0c Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Thu, 9 Nov 2017 13:19:08 +0100
Subject: [PATCH] roles/ipaclient/tasks/[un]install.yml: Use better formatting
for commands
---
roles/ipaclient/tasks/install.yml | 5 ++++-
roles/ipaclient/tasks/uninstall.yml | 5 ++++-
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/roles/ipaclient/tasks/install.yml b/roles/ipaclient/tasks/install.yml
index 20be7648..b5c214b7 100644
--- a/roles/ipaclient/tasks/install.yml
+++ b/roles/ipaclient/tasks/install.yml
@@ -90,7 +90,10 @@
when: not ipatest.krb5_keytab_ok and (ipaadmin_password is undefined or ipaadmin_password == "") and (ipaclient_keytab is undefined or ipaclient_keytab == "")
- name: Install - Purge {{ ipadiscovery.realm }} from host keytab
- command: /usr/sbin/ipa-rmkeytab -k /etc/krb5.keytab -r "{{ ipadiscovery.realm }}"
+ command: >
+ /usr/sbin/ipa-rmkeytab
+ -k /etc/krb5.keytab
+ -r "{{ ipadiscovery.realm }}"
register: iparmkeytab
# Do not fail on error codes 3 and 5:
# 3 - Unable to open keytab
diff --git a/roles/ipaclient/tasks/uninstall.yml b/roles/ipaclient/tasks/uninstall.yml
index 2569a045..75d0a52d 100644
--- a/roles/ipaclient/tasks/uninstall.yml
+++ b/roles/ipaclient/tasks/uninstall.yml
@@ -6,7 +6,10 @@
static: yes
- name: Uninstall - Uninstall IPA client
- command: /usr/sbin/ipa-client-install --uninstall -U
+ command: >
+ /usr/sbin/ipa-client-install
+ --uninstall
+ -U
register: uninstall
# 2 means that uninstall failed because IPA client was not configured
failed_when: uninstall.rc != 0 and uninstall.rc != 2
--
GitLab