From 481f1f84d51b2fab1cd94f581a2d3afd57594aa5 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sat, 12 Sep 2015 00:49:53 +0200 Subject: [PATCH] Added private repo for additional packages. Modified ansible roles accordingly. --- roles/doraemon/tasks/doraemon.yml | 16 ++++------------ roles/npm/tasks/npm.yml | 16 ++++------------ roles/setup/files/sys42.repo | 5 +++++ roles/setup/tasks/main.yml | 3 +++ roles/setup/tasks/pvtrepo.yml | 10 ++++++++++ 5 files changed, 26 insertions(+), 24 deletions(-) create mode 100644 roles/setup/files/sys42.repo create mode 100644 roles/setup/tasks/pvtrepo.yml diff --git a/roles/doraemon/tasks/doraemon.yml b/roles/doraemon/tasks/doraemon.yml index e922d83..03839b0 100644 --- a/roles/doraemon/tasks/doraemon.yml +++ b/roles/doraemon/tasks/doraemon.yml @@ -2,20 +2,12 @@ # Installa e configura il servizio per rinominare il client # Grazie per il servizio a Enrico Bacis -- name: Check installazione + versione doraemon - shell: rpm -q doraemon - ignore_errors: yes - register: check_doraemon_pkg - changed_when: check_doraemon_pkg.rc != 0 or check_doraemon_pkg.stdout.find('{{ doraemon_version }}') == -1 - -- name: Rimozione versioni precedenti - yum: pkg=doraemon state=absent - sudo: yes - when: check_doraemon_pkg|changed +# Considerando di aver creato il repo, viene comunque installata l'ultima versione disponibile - name: Installazione doraemon - yum: pkg='http://sys42.eu/downloads/rpm/doraemon-{{ doraemon_version }}.ns6.noarch.rpm' state=present - when: check_doraemon_pkg|changed + yum: + pkg: doraemon + state: latest sudo: yes - name: Verifico avvio di doraemon diff --git a/roles/npm/tasks/npm.yml b/roles/npm/tasks/npm.yml index c7a9260..961fd7f 100644 --- a/roles/npm/tasks/npm.yml +++ b/roles/npm/tasks/npm.yml @@ -1,16 +1,8 @@ --- -- name: Check installazione + versione networkpackagemanager - shell: rpm -q nethserver-networkpackagemanager - ignore_errors: yes - register: check_npm_pkg - changed_when: check_npm_pkg.rc != 0 or check_npm_pkg.stdout.find('{{ npm_version }}') == -1 - -- name: Rimozione versioni precedenti - yum: pkg=nethserver-networkpackagemanager state=absent - sudo: yes - when: check_npm_pkg|changed +# Anche in questo caso, avendo preparato il repo, l'ultima versione viene installata da repo - name: Installazione networkpackagemanager - yum: pkg='http://sys42.eu/downloads/rpm/nethserver-networkpackagemanager-{{ npm_version }}.ns6.noarch.rpm' state=present - when: check_npm_pkg|changed + yum: + pkg: nethserver-networkpackagemanager + state: latest sudo: yes diff --git a/roles/setup/files/sys42.repo b/roles/setup/files/sys42.repo new file mode 100644 index 0000000..efa7c4a --- /dev/null +++ b/roles/setup/files/sys42.repo @@ -0,0 +1,5 @@ +[sys42] +name=NethServer sys42.eu repo +baseurl=http://nethserver.sys42.eu +enabled=1 +gpgcheck=0 diff --git a/roles/setup/tasks/main.yml b/roles/setup/tasks/main.yml index d714e73..d9ab102 100644 --- a/roles/setup/tasks/main.yml +++ b/roles/setup/tasks/main.yml @@ -7,6 +7,9 @@ when: ansible_distribution == "CentOS" and ansible_os_family == "RedHat" tags: centos +- include: pvtrepo.yml + tags: sys42.eu + - include: ansible.yml when: ansible_distribution == "CentOS" tags: diff --git a/roles/setup/tasks/pvtrepo.yml b/roles/setup/tasks/pvtrepo.yml new file mode 100644 index 0000000..5e7aa0e --- /dev/null +++ b/roles/setup/tasks/pvtrepo.yml @@ -0,0 +1,10 @@ +--- +- name: Installazione istruzioni per repo sys42.eu + copy: + src: sys42.repo + dest: /etc/yum.repos.d/sys42.repo + sudo: yes + +- name: Ricalcolo repository disponibili + shell: yum repolist + sudo: yes