From 0154f36a692f6c2df3c432ccc84b52258bc54c86 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: Tue, 17 Jul 2018 18:27:54 +0200
Subject: [PATCH] Added ipa- prefix to krb5 and sssd roles as these are
ansible-freeipa specific
These roles will most likely not work in the common case. Therefore the roles
have been renamed.
The ipa-krpb5 role is used by ipcalient, but the ipa-sssd role is currently
not used.
---
roles/{krb5 => ipa-krb5}/defaults/main.yml | 0
roles/{krb5 => ipa-krb5}/meta/main.yml | 0
roles/{krb5 => ipa-krb5}/tasks/main.yml | 0
roles/{krb5 => ipa-krb5}/templates/krb5.conf.j2 | 0
roles/{krb5 => ipa-krb5}/vars/default.yml | 0
roles/{sssd => ipa-sssd}/defaults/main.yml | 0
roles/{sssd => ipa-sssd}/meta/main.yml | 0
roles/{sssd => ipa-sssd}/tasks/main.yml | 0
roles/{sssd => ipa-sssd}/templates/sssd.conf.j2 | 0
roles/{sssd => ipa-sssd}/vars/default.yml | 0
roles/ipaclient/tasks/install.yml | 4 ++--
11 files changed, 2 insertions(+), 2 deletions(-)
rename roles/{krb5 => ipa-krb5}/defaults/main.yml (100%)
rename roles/{krb5 => ipa-krb5}/meta/main.yml (100%)
rename roles/{krb5 => ipa-krb5}/tasks/main.yml (100%)
rename roles/{krb5 => ipa-krb5}/templates/krb5.conf.j2 (100%)
rename roles/{krb5 => ipa-krb5}/vars/default.yml (100%)
rename roles/{sssd => ipa-sssd}/defaults/main.yml (100%)
rename roles/{sssd => ipa-sssd}/meta/main.yml (100%)
rename roles/{sssd => ipa-sssd}/tasks/main.yml (100%)
rename roles/{sssd => ipa-sssd}/templates/sssd.conf.j2 (100%)
rename roles/{sssd => ipa-sssd}/vars/default.yml (100%)
diff --git a/roles/krb5/defaults/main.yml b/roles/ipa-krb5/defaults/main.yml
similarity index 100%
rename from roles/krb5/defaults/main.yml
rename to roles/ipa-krb5/defaults/main.yml
diff --git a/roles/krb5/meta/main.yml b/roles/ipa-krb5/meta/main.yml
similarity index 100%
rename from roles/krb5/meta/main.yml
rename to roles/ipa-krb5/meta/main.yml
diff --git a/roles/krb5/tasks/main.yml b/roles/ipa-krb5/tasks/main.yml
similarity index 100%
rename from roles/krb5/tasks/main.yml
rename to roles/ipa-krb5/tasks/main.yml
diff --git a/roles/krb5/templates/krb5.conf.j2 b/roles/ipa-krb5/templates/krb5.conf.j2
similarity index 100%
rename from roles/krb5/templates/krb5.conf.j2
rename to roles/ipa-krb5/templates/krb5.conf.j2
diff --git a/roles/krb5/vars/default.yml b/roles/ipa-krb5/vars/default.yml
similarity index 100%
rename from roles/krb5/vars/default.yml
rename to roles/ipa-krb5/vars/default.yml
diff --git a/roles/sssd/defaults/main.yml b/roles/ipa-sssd/defaults/main.yml
similarity index 100%
rename from roles/sssd/defaults/main.yml
rename to roles/ipa-sssd/defaults/main.yml
diff --git a/roles/sssd/meta/main.yml b/roles/ipa-sssd/meta/main.yml
similarity index 100%
rename from roles/sssd/meta/main.yml
rename to roles/ipa-sssd/meta/main.yml
diff --git a/roles/sssd/tasks/main.yml b/roles/ipa-sssd/tasks/main.yml
similarity index 100%
rename from roles/sssd/tasks/main.yml
rename to roles/ipa-sssd/tasks/main.yml
diff --git a/roles/sssd/templates/sssd.conf.j2 b/roles/ipa-sssd/templates/sssd.conf.j2
similarity index 100%
rename from roles/sssd/templates/sssd.conf.j2
rename to roles/ipa-sssd/templates/sssd.conf.j2
diff --git a/roles/sssd/vars/default.yml b/roles/ipa-sssd/vars/default.yml
similarity index 100%
rename from roles/sssd/vars/default.yml
rename to roles/ipa-sssd/vars/default.yml
diff --git a/roles/ipaclient/tasks/install.yml b/roles/ipaclient/tasks/install.yml
index 1ecb36d0..2ad4eb63 100644
--- a/roles/ipaclient/tasks/install.yml
+++ b/roles/ipaclient/tasks/install.yml
@@ -192,7 +192,7 @@
- name: Install - Configure krb5 for IPA realm "{{ ipadiscovery.realm }} <= 4.4"
include_role:
- name: krb5
+ name: ipa-krb5
vars:
krb5_servers: "{{ ipadiscovery.servers if not ipadiscovery.dnsok or not ipadiscovery.kdc else [ ] }}"
krb5_realm: "{{ ipadiscovery.realm }}"
@@ -204,7 +204,7 @@
- name: Install - Configure krb5 for IPA realm "{{ ipadiscovery.realm }} > 4.4"
include_role:
- name: krb5
+ name: ipa-krb5
vars:
krb5_servers: "{{ ipadiscovery.servers if not ipadiscovery.dnsok or not ipadiscovery.kdc else [ ] }}"
krb5_realm: "{{ ipadiscovery.realm }}"
--
GitLab