From 9164552f6f7ba16ec3cd49ff7e2551cced366fd7 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Thu, 13 Oct 2016 17:57:17 +0000 Subject: [PATCH] Put krb5.conf in base role Signed-off-by: Patrick Uiterwijk --- roles/base/tasks/main.yml | 7 +++++++ roles/{fas_server => base}/templates/krb5.conf.j2 | 0 roles/fas_server/tasks/main.yml | 6 ------ 3 files changed, 7 insertions(+), 6 deletions(-) rename roles/{fas_server => base}/templates/krb5.conf.j2 (100%) diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index 7706a80c53..942814f1aa 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -371,3 +371,10 @@ - config - prompt +# Set krb5 conf +- name: configure krb5 + template: src=krb5.conf.j2 dest=/etc/krb5.conf owner=root group=root mode=0644 + tags: + - base + - config + - krb diff --git a/roles/fas_server/templates/krb5.conf.j2 b/roles/base/templates/krb5.conf.j2 similarity index 100% rename from roles/fas_server/templates/krb5.conf.j2 rename to roles/base/templates/krb5.conf.j2 diff --git a/roles/fas_server/tasks/main.yml b/roles/fas_server/tasks/main.yml index 61348375ac..01a975bf50 100644 --- a/roles/fas_server/tasks/main.yml +++ b/roles/fas_server/tasks/main.yml @@ -25,12 +25,6 @@ - packages - fas -- name: configure krb5 - template: src=krb5.conf.j2 dest=/etc/krb5.conf owner=root group=root mode=0644 - tags: - - config - - fas - - name: install IPA keytab copy: > src="{{ private }}/files/keytabs/{{env}}/fas_sync"