From 4d83c27e6abce3ff1a029a37a50704309f11d0d3 Mon Sep 17 00:00:00 2001 From: Tim Flink Date: Mon, 18 Aug 2014 09:50:06 +0000 Subject: [PATCH] use valid ansible syntax to determine when to use buildslave ssh keypair --- roles/taskotron/buildslave-configure/tasks/main.yml | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/roles/taskotron/buildslave-configure/tasks/main.yml b/roles/taskotron/buildslave-configure/tasks/main.yml index 1be1d37f0a..9ee7692d30 100644 --- a/roles/taskotron/buildslave-configure/tasks/main.yml +++ b/roles/taskotron/buildslave-configure/tasks/main.yml @@ -17,19 +17,19 @@ - host - name: create slave ssh directory - when: deployment_type != qadevel + when: buildslave_public_sshkey_file is defined file: path={{ slave_home }}/.ssh owner={{ slave_user }} group={{ slave_user }} mode=0700 state=directory - name: install slave ssh private key - when: deployment_type != qadevel + when: buildslave_private_sshkey_file is defined copy: src={{ private }}/files/taskotron/{{ buildslave_private_sshkey_file }} dest={{ slave_home }}/.ssh/id_rsa owner={{ slave_user }} group={{ slave_user }} mode=0600 - name: install slave ssh public key - when: deployment_type != qadevel + when: buildslave_public_sshkey_file is defined copy: src={{ private }}/files/taskotron/{{ buildslave_public_sshkey_file }} dest={{ slave_home }}/.ssh/id_rsa.pub owner={{ slave_user }} group={{ slave_user }} mode=0644 - name: make sure master is in known_hosts - when: deployment_type != qadevel + when: buildslave_public_sshkey_file is defined lineinfile: dest=/home/{{ slave_user }}/.ssh/known_hosts regexp='{{ buildmaster }}' line='{{ buildmaster }} {{ buildmaster_pubkey }}' create=yes owner={{ slave_user }} group={{ slave_user }} - name: generate buildslave service file @@ -38,4 +38,3 @@ - name: start and enable buildslave service service: name=buildslave enabled=yes state=started -