From 53c07dd3662c6124e7e53fbee0b4f4fe332e29a5 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Wed, 22 Apr 2015 00:07:42 +0200 Subject: [PATCH] Sposto la creazione della chiave all'inizio del task di setup. --- roles/init/tasks/main.yml | 2 -- roles/setup/tasks/main.yml | 3 +++ roles/{init => setup}/tasks/ssh-keygen.yml | 10 ++++------ 3 files changed, 7 insertions(+), 8 deletions(-) rename roles/{init => setup}/tasks/ssh-keygen.yml (63%) diff --git a/roles/init/tasks/main.yml b/roles/init/tasks/main.yml index a09c0e7..ebfa79b 100644 --- a/roles/init/tasks/main.yml +++ b/roles/init/tasks/main.yml @@ -12,5 +12,3 @@ when: ansible_os_family == "RedHat" - include: mgmtuser.yml - -- include: ssh-keygen.yml diff --git a/roles/setup/tasks/main.yml b/roles/setup/tasks/main.yml index 76710e9..6614a01 100644 --- a/roles/setup/tasks/main.yml +++ b/roles/setup/tasks/main.yml @@ -1,5 +1,8 @@ --- +- include: ssh-keygen.yml + tags: ssh + - include: centos_pkgs.yml when: ansible_distribution == "CentOS" and ansible_os_family == "RedHat" tags: centos diff --git a/roles/init/tasks/ssh-keygen.yml b/roles/setup/tasks/ssh-keygen.yml similarity index 63% rename from roles/init/tasks/ssh-keygen.yml rename to roles/setup/tasks/ssh-keygen.yml index b0e21fb..504cd86 100644 --- a/roles/init/tasks/ssh-keygen.yml +++ b/roles/setup/tasks/ssh-keygen.yml @@ -1,22 +1,20 @@ --- - name: Verifica presenza directory .ssh - shell: test -d /root/.ssh + shell: test -d $HOME/.ssh register: check_sshdir ignore_errors: true - name: Creazione directory .ssh - shell: mkdir -p /root/.ssh + shell: mkdir -p $HOME/.ssh when: check_sshdir|failed - name: Verifica chiave ssh - shell: test -f /root/.ssh/id_rsa + shell: test -f $HOME/.ssh/id_rsa changed_when: false ignore_errors: true register: check_key - name: Gestione creazione chiave ssh - shell: ssh-keygen -t rsa -b 1024 -f /root/.ssh/id_rsa -N '' - sudo: yes - sudo_user: root + shell: ssh-keygen -t rsa -b 1024 -f $HOME/.ssh/id_rsa -N '' when: check_key|failed