From f81cdc54136341d37f716712f7276f530be869f0 Mon Sep 17 00:00:00 2001 From: Karsten Hopp Date: Dec 04 2018 16:24:34 +0000 Subject: fix ansible deprecation warnings don't fail playbook if ClamAV DB is already up to date suppress warning about using rpm directly Signed-off-by: Karsten Hopp --- diff --git a/dev/ansible/roles/pagure-dev/tasks/clamav.yml b/dev/ansible/roles/pagure-dev/tasks/clamav.yml index 537d95a..e173921 100644 --- a/dev/ansible/roles/pagure-dev/tasks/clamav.yml +++ b/dev/ansible/roles/pagure-dev/tasks/clamav.yml @@ -1,12 +1,13 @@ --- - name: Install ClamAV packages - dnf: name={{ item }} state=present - with_items: - - clamav-data-empty - - clamav-server - - clamav-server-systemd - - clamav-update + dnf: + name: + - clamav-data-empty + - clamav-server + - clamav-server-systemd + - clamav-update + state: present - name: Configure freshclam replace: @@ -25,6 +26,7 @@ - name: Download latest ClamAV database command: freshclam + ignore_errors: yes - name: Start ClamAV service: name=clamd@pagure state=started enabled=yes diff --git a/dev/ansible/roles/pagure-dev/tasks/eventsource.yml b/dev/ansible/roles/pagure-dev/tasks/eventsource.yml index 6bf06a6..fb91024 100644 --- a/dev/ansible/roles/pagure-dev/tasks/eventsource.yml +++ b/dev/ansible/roles/pagure-dev/tasks/eventsource.yml @@ -1,12 +1,12 @@ --- - name: Install Redis - dnf: name={{ item }} state=present - with_items: - - python3-redis - - python3-trololio - - redis - + dnf: + name: + - python3-redis + - python3-trololio + - redis + state: present - name: Start Redis service: name=redis state=started enabled=yes diff --git a/dev/ansible/roles/pagure-dev/tasks/gitolite.yml b/dev/ansible/roles/pagure-dev/tasks/gitolite.yml index 61080bd..2859409 100644 --- a/dev/ansible/roles/pagure-dev/tasks/gitolite.yml +++ b/dev/ansible/roles/pagure-dev/tasks/gitolite.yml @@ -1,9 +1,10 @@ --- - name: Install gitolite3 - dnf: name={{ item }} state=present - with_items: - - gitolite3 + dnf: + name: + - gitolite3 + state: present - name: Install gitolite.rc to ~/.gitolite.rc become_user: "{{ ansible_env.SUDO_USER }}" diff --git a/dev/ansible/roles/pagure-dev/tasks/main.yml b/dev/ansible/roles/pagure-dev/tasks/main.yml index f8100f0..cea6294 100644 --- a/dev/ansible/roles/pagure-dev/tasks/main.yml +++ b/dev/ansible/roles/pagure-dev/tasks/main.yml @@ -7,59 +7,63 @@ - include: postgres.yml - name: Install helpful development packages - dnf: name={{ item }} state=present - with_items: - - git - - ngrep - - nmap-ncat - - python3-rpdb - - tmux - - tree - - vim-enhanced + dnf: + name: + - git + - ngrep + - nmap-ncat + - python3-rpdb + - tmux + - tree + - vim-enhanced + state: present - name: Install Pagure development packages - dnf: name={{ item }} state=present - with_items: - - gcc - - libgit2-devel - - libffi-devel - - libjpeg-devel - - make - - python3-alembic - - python3-arrow - - python3-binaryornot - - python3-bleach - - python3-blinker - - python3-chardet - - python3-cryptography - - python3-docutils - - python3-enum34 - - python3-eventlet - - python3-fedora-flask - - python3-flask - - python3-flask-wtf - - python3-jinja2 - - python3-markdown - - python3-munch - - python3-openid-cla - - python3-openid-teams - - python3-pip - - python3-psutil - - python3-pygit2 - - python3-redis - - python3-sqlalchemy - - python3-straight-plugin - - python3-virtualenvwrapper - - python3-wtforms - - python3-devel - - python3-devel - - redhat-rpm-config - - python3-bcrypt - - python3-virtualenv + dnf: + name: + - gcc + - libgit2-devel + - libffi-devel + - libjpeg-devel + - make + - python3-alembic + - python3-arrow + - python3-binaryornot + - python3-bleach + - python3-blinker + - python3-chardet + - python3-cryptography + - python3-docutils + - python3-enum34 + - python3-eventlet + - python3-fedora-flask + - python3-flask + - python3-flask-wtf + - python3-jinja2 + - python3-markdown + - python3-munch + - python3-openid-cla + - python3-openid-teams + - python3-pip + - python3-psutil + - python3-pygit2 + - python3-redis + - python3-sqlalchemy + - python3-straight-plugin + - python3-virtualenvwrapper + - python3-wtforms + - python3-devel + - python3-devel + - redhat-rpm-config + - python3-bcrypt + - python3-virtualenv + state: present - name: register the libgit2 version installed shell: rpm -q libgit2|cut -d \- -f 2| cut -d \. -f 1,2 register: libgit2_version + args: + warn: false # Add various helpful configuration files - name: Install a custom bashrc @@ -85,22 +89,20 @@ - name: Install pygit2 in the virtualenv become_user: "{{ ansible_env.SUDO_USER }}" pip: - name: "{{ item }}" + name: + - "pygit2=={{ libgit2_version.stdout_lines[0] }}.*" virtualenv: /home/{{ ansible_env.SUDO_USER }}/.virtualenvs/python3-pagure/ virtualenv_python: python3 virtualenv_command: virtualenv-3 - with_items: - - "pygit2=={{ libgit2_version.stdout_lines[0] }}.*" # Install Pagure inside a virtualenv and configure it for python3 - name: Install pygit2 in the python3 virtualenv become_user: "{{ ansible_env.SUDO_USER }}" pip: - name: "{{ item }}" + name: + - "pygit2=={{ libgit2_version.stdout_lines[0] }}.*" virtualenv: /home/{{ ansible_env.SUDO_USER }}/.virtualenvs/python3-pagure/ virtualenv_python: python3 - with_items: - - "pygit2=={{ libgit2_version.stdout_lines[0] }}.*" - name: Install Pagure Python dependencies into a virtualenv become_user: "{{ ansible_env.SUDO_USER }}" @@ -209,13 +211,12 @@ become: False systemd: daemon_reload: yes - name: "{{ item }}" + name: + - pagure + - pagure-docs + - pagure_ci + - pagure_ev + - pagure_webhook + - pagure_worker enabled: True user: yes - with_items: - - pagure - - pagure-docs - - pagure_ci - - pagure_ev - - pagure_webhook - - pagure_worker diff --git a/dev/ansible/roles/pagure-dev/tasks/milter.yml b/dev/ansible/roles/pagure-dev/tasks/milter.yml index 1638907..6ea45a0 100644 --- a/dev/ansible/roles/pagure-dev/tasks/milter.yml +++ b/dev/ansible/roles/pagure-dev/tasks/milter.yml @@ -1,10 +1,12 @@ --- - name: Install Pagure milter packages - dnf: name={{ item }} state=present enablerepo=updates-testing - with_items: - - postfix - - python3-pymilter + dnf: + name: + - postfix + - python3-pymilter + state: present + enablerepo: updates-testing - name: Start Postfix service: name=postfix state=started enabled=yes diff --git a/dev/ansible/roles/pagure-dev/tasks/postgres.yml b/dev/ansible/roles/pagure-dev/tasks/postgres.yml index 4734f1f..da710a8 100644 --- a/dev/ansible/roles/pagure-dev/tasks/postgres.yml +++ b/dev/ansible/roles/pagure-dev/tasks/postgres.yml @@ -1,12 +1,13 @@ --- - name: Install postgresql packages - dnf: name={{ item }} state=present - with_items: + dnf: + name: - postgresql - postgresql-server - postgresql-devel # Allows pip installing psycopg2 is desired - python3-psycopg2 + state: present - name: Initialize PostgreSQL command: postgresql-setup initdb