From ab40af84d18400cef4210b02ef2d21142410893f Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Tue, 20 Dec 2016 05:16:33 +0000 Subject: [PATCH] Make it a task Signed-off-by: Patrick Uiterwijk --- handlers/ipa.yml | 7 ------- playbooks/groups/ipa.yml | 7 ++++++- 2 files changed, 6 insertions(+), 8 deletions(-) delete mode 100644 handlers/ipa.yml diff --git a/handlers/ipa.yml b/handlers/ipa.yml deleted file mode 100644 index deec669d50..0000000000 --- a/handlers/ipa.yml +++ /dev/null @@ -1,7 +0,0 @@ -######################## -# Handlers for IPA stuff -# - -# This is used to combine the IPA keytabs for local host and id.fp.o -- name: combine IPA http keytabs - shell: printf "%b" "read_kt /etc/httpd/conf/ipa.keytab\nread_kt /etc/krb5.HTTP_id{{env_suffix}}.fedoraproject.org.keytab\nwrite_kt /etc/krb5.HTTP_id{{env_suffix}}.fedoraproject.org.keytab.combined" | ktutil diff --git a/playbooks/groups/ipa.yml b/playbooks/groups/ipa.yml index 177d586272..36de721db3 100644 --- a/playbooks/groups/ipa.yml +++ b/playbooks/groups/ipa.yml @@ -52,7 +52,12 @@ handlers: - include: "{{ handlers }}/restart_services.yml" - - include: "{{ handlers }}/ipa.yml" + + tasks: + - name: Combine IPA keytabs + shell: printf "%b" "read_kt /etc/httpd/conf/ipa.keytab\nread_kt /etc/krb5.HTTP_id{{env_suffix}}.fedoraproject.org.keytab\nwrite_kt /etc/krb5.HTTP_id{{env_suffix}}.fedoraproject.org.keytab.combined" | ktutil + tags: + - krb5 - name: do base role once more to revert any resolvconf changes hosts: ipa:ipa-stg