From 5e09dce82d239ba176cb9e8e821e451bc88e83dc Mon Sep 17 00:00:00 2001 From: Nils Philippsen Date: Thu, 12 Aug 2021 12:50:10 +0200 Subject: [PATCH] Import fedora-messaging-utils role Importing the role rather than listing it in the playbook lets its tasks have the tags used in the importing role, i.e. should ensure they are run when the things that need simple_message_to_bus are installed. Additionally, don't attempt to install it manually from web-data-analysis (it isn't found because it lives in a different role). Signed-off-by: Nils Philippsen --- playbooks/groups/logserver.yml | 1 - roles/awstats/tasks/main.yml | 5 +++++ roles/web-data-analysis/tasks/main.yml | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml index a1a9f06534..76ded5ec10 100644 --- a/playbooks/groups/logserver.yml +++ b/playbooks/groups/logserver.yml @@ -23,7 +23,6 @@ - sudo - awstats - web-data-analysis - - fedora-messaging-utils - role: keytab/service owner_user: apache owner_group: apache diff --git a/roles/awstats/tasks/main.yml b/roles/awstats/tasks/main.yml index 21e01184fb..ae5be08d6e 100644 --- a/roles/awstats/tasks/main.yml +++ b/roles/awstats/tasks/main.yml @@ -10,6 +10,11 @@ tags: - awstats +- name: ensure messaging script is installed + import_role: name=fedora-messaging-utils + tags: + - awstats + - name: awstats proxy merge script (log01) copy: src=combineHttpLogs.sh dest=/usr/local/bin/ mode=0755 tags: diff --git a/roles/web-data-analysis/tasks/main.yml b/roles/web-data-analysis/tasks/main.yml index b7dc036f92..955c91d820 100644 --- a/roles/web-data-analysis/tasks/main.yml +++ b/roles/web-data-analysis/tasks/main.yml @@ -140,8 +140,8 @@ tags: - web-data -- name: install messaging script for our improvized tracing - copy: src=simple_message_to_bus dest=/usr/local/bin/ mode=0755 +- name: ensure messaging script is installed + import_role: name=fedora-messaging-utils tags: - web-data - cron