From ba73b7cb26e3db4fdced705cac221b606c8d50fb Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Tue, 2 Feb 2021 17:34:44 +0100 Subject: [PATCH] ipa/client: make mutually exclusive with old FAS way The fas_client role and 2fa_client tasks are incompatible with the ipa/client role, so mask them out for MBS and OSBS hosts in staging, just as with the bugzilla2fedmsg and github2fedmsg group playbooks. This will have to be done for all hosts, groups using the ipa/client role. Signed-off-by: Nils Philippsen --- playbooks/groups/mbs.yml | 2 +- playbooks/groups/osbs/deploy-cluster.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/playbooks/groups/mbs.yml b/playbooks/groups/mbs.yml index ce1e48b281..fc8b448bdd 100644 --- a/playbooks/groups/mbs.yml +++ b/playbooks/groups/mbs.yml @@ -18,7 +18,7 @@ - rkhunter - nagios_client - hosts - - ipa/client + - { role: ipa/client, when: env == "staging" } - { role: fas_client, when: env != "staging" } - rsyncd - sudo diff --git a/playbooks/groups/osbs/deploy-cluster.yml b/playbooks/groups/osbs/deploy-cluster.yml index 238e5c2f6b..ffd2c96f60 100644 --- a/playbooks/groups/osbs/deploy-cluster.yml +++ b/playbooks/groups/osbs/deploy-cluster.yml @@ -27,7 +27,7 @@ - rkhunter - nagios_client - hosts - - ipa/client + - { role: ipa/client, when: env == "staging" } - { role: fas_client, when: env != "staging" } - sudo - collectd/base @@ -45,6 +45,7 @@ name: subscription-manager-rhsm-certificates state: present - import_tasks: "{{ tasks_path }}/2fa_client.yml" + when: env != "staging" - import_tasks: "{{ tasks_path }}/motd.yml" handlers: