From ee97aa74d3a087779c124a8e719f44ba0f4e2154 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Wed, 15 Apr 2015 18:12:38 +0200 Subject: [PATCH] Aggiunto task per scaricare parte di gestione client ansible. Taggati task per debug. --- README.md | 4 +++- hosts | 2 +- roles/base/tasks/add_centos_repos.yml | 18 +++++++++--------- roles/base/tasks/ansible.yml | 10 ++++++++++ roles/base/tasks/main.yml | 2 ++ roles/base/tasks/packages.yml | 2 +- 6 files changed, 26 insertions(+), 12 deletions(-) create mode 100644 roles/base/tasks/ansible.yml diff --git a/README.md b/README.md index dc7dd88..e11e17a 100644 --- a/README.md +++ b/README.md @@ -4,4 +4,6 @@ Qui sono presenti i files di configurazione per il server ClearOS. Per configurarlo: $ vim hosts - $ ansible-playbook server.yml --ask-pass + $ ansible-playbook firstsetup.yml -u root --ask-pass \ + -e "admin_sshkey=/path/to/id_rsa.pub" + $ ansible-playbook server.yml diff --git a/hosts b/hosts index db02137..48575f6 100644 --- a/hosts +++ b/hosts @@ -1,4 +1,4 @@ [server] -pdc ansible_ssh_host=10.0.0.1 +pdc ansible_ssh_host=10.0.0.1 ansible_ssh_user=amgmt [clients] diff --git a/roles/base/tasks/add_centos_repos.yml b/roles/base/tasks/add_centos_repos.yml index 6fd463c..d93808c 100644 --- a/roles/base/tasks/add_centos_repos.yml +++ b/roles/base/tasks/add_centos_repos.yml @@ -3,58 +3,58 @@ - name: Verifica configurazione CentOS 6 file: name=/etc/yum.repos.d/CentOS-Base.repo state=file sudo: yes - remote_user: amgmt ignore_errors: yes register: check_repos + tags: repo - name: Scarico configurazione per CentOS 6 get_url: url: http://mirror.centos.org/centos/6/os/x86_64/Packages/centos-release-6-6.el6.centos.12.2.x86_64.rpm dest: /tmp/centos-release-6-6.el6.centos.12.2.x86_64.rpm sudo: yes - remote_user: amgmt when: check_repos|failed + tags: repo - name: Scompatto configurazione CentOS 6 shell: mkdir -p /tmp/centos-release && pushd /tmp/centos-release && rpm2cpio ../centos-release-6-6.el6.centos.12.2.x86_64.rpm | cpio -idmv && popd sudo: yes - remote_user: amgmt when: check_repos|failed + tags: repo - name: Copio i repository shell: cp -f /tmp/centos-release/etc/yum.repos.d/* /etc/yum.repos.d/ sudo: yes - remote_user: amgmt when: check_repos|failed register: centos_repo_installed + tags: repo - name: Copio le chiavi di firma GPG shell: cp -f /tmp/centos-release/etc/pki/rpm-gpg/* /etc/pki/rpm-gpg/ sudo: yes - remote_user: amgmt when: check_repos|failed + tags: repo # Senza di questa, non รจ possibile installare EPEL dopo - name: Prima attivazione repo shell: yum clean all && yum repolist sudo: yes - remote_user: amgmt when: centos_repo_installed|changed + tags: repo - name: Attivo EPEL yum: name=epel-release state=present sudo: yes - remote_user: amgmt register: epel_installed + tags: repo - name: Seconda attivazione repo shell: yum clean all && yum repolist sudo: yes - remote_user: amgmt when: epel_installed|changed + tags: repo - name: Pulizia shell: rm -rf /tmp/centos-release && rm -f /tmp/centos-release-6-6.el6.centos.12.2.x86_64.rpm /tmp/epel-release-6-8.noarch.rpm sudo: yes - remote_user: amgmt when: check_repos|failed + tags: repo diff --git a/roles/base/tasks/ansible.yml b/roles/base/tasks/ansible.yml new file mode 100644 index 0000000..7e65395 --- /dev/null +++ b/roles/base/tasks/ansible.yml @@ -0,0 +1,10 @@ +--- + +- name: Download della gestione client con ansible + git: repo=http://github.com/syntaxerrormmm/ps-clientmgmt.git + dest=/root/clientmgmt + remote_user: amgmt + sudo: yes + tags: + - git + - ansible diff --git a/roles/base/tasks/main.yml b/roles/base/tasks/main.yml index db24d99..d702803 100644 --- a/roles/base/tasks/main.yml +++ b/roles/base/tasks/main.yml @@ -5,3 +5,5 @@ - include: packages.yml when: ansible_os_family == 'ClearOS' + +- include: ansible.yml diff --git a/roles/base/tasks/packages.yml b/roles/base/tasks/packages.yml index 179d00b..f9b30eb 100644 --- a/roles/base/tasks/packages.yml +++ b/roles/base/tasks/packages.yml @@ -3,7 +3,6 @@ - name: Installo pacchetti di gestione yum: name={{ item }} state=present sudo: yes - remote_user: amgmt when: ansible_os_family == 'ClearOS' with_items: - vim-enhanced @@ -11,3 +10,4 @@ - screen - sshpass - ansible + tags: pkg