commit 9385066151ad1584cb010430f3c4efa37e07e0db Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Wed Feb 21 21:50:44 2018 +0100 Various fixes playbooks/groups/bastion.yml | 2 +- playbooks/groups/fas.yml | 5 ++--- playbooks/groups/koji-hub.yml | 2 +- roles/fas_client/files/fas-client.cron | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) --- diff --git a/playbooks/groups/bastion.yml b/playbooks/groups/bastion.yml index c7316e7..3ed10ea 100644 --- a/playbooks/groups/bastion.yml +++ b/playbooks/groups/bastion.yml @@ -36,6 +36,6 @@ tasks: - name: install needed packages - yum: pkg={{ item }} state=present + package: name={{ item }} state=present with_items: - ipmitool diff --git a/playbooks/groups/fas.yml b/playbooks/groups/fas.yml index b766734..3e5e2d4 100644 --- a/playbooks/groups/fas.yml +++ b/playbooks/groups/fas.yml @@ -7,7 +7,7 @@ user: root gather_facts: True - vars_files: + vars_files: - /srv/web/infra/ansible/vars/global.yml - "/srv/private/ansible/vars.yml" - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml @@ -21,7 +21,7 @@ - collectd/base - rsyncd - memcached - - apache + - mod_wsgi - fas_server - fedmsg/base - sudo @@ -32,7 +32,6 @@ - import_tasks: "{{ tasks_path }}/yumrepos.yml" - import_tasks: "{{ tasks_path }}/2fa_client.yml" - import_tasks: "{{ tasks_path }}/motd.yml" - - import_tasks: "{{ tasks_path }}/mod_wsgi.yml" handlers: - import_tasks: "{{ handlers_path }}/restart_services.yml" diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index 1f4c6a6..40854fe 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -2,7 +2,7 @@ # NOTE: should be used with --limit most of the time # NOTE: most of these vars_path come from group_vars/koji-hub or from hostvars -- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koji-stg:koji01.rpmfusion.org:koji02.rpmfusion.org:s390-koji01.qa.rpmfusion.org:arm-koji01.qa.rpmfusion.org" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koji-stg:koji" # Once the instance exists, configure it. diff --git a/roles/fas_client/files/fas-client.cron b/roles/fas_client/files/fas-client.cron index 6c9a948..f86928c 100644 --- a/roles/fas_client/files/fas-client.cron +++ b/roles/fas_client/files/fas-client.cron @@ -1 +1 @@ -00 20 * * * root /usr/local/bin/lock-wrapper fasClient "/bin/sleep $(($RANDOM \% 900)); /usr/bin/fasClient -i | /usr/local/bin/nag-once fassync 1d 2>&1" +00 20 * * * root /usr/local/bin/lock-wrapper fasClient "/bin/sleep $(($RANDOM \% 900)); /usr/bin/fasClient -i |& grep -vi deprecation | /usr/local/bin/nag-once fassync 1d 2>&1"