use valid ansible syntax to determine when to use buildslave ssh keypair

This commit is contained in:
Tim Flink 2014-08-18 09:50:06 +00:00
parent 2cd2014c64
commit 4d83c27e6a

View file

@ -17,19 +17,19 @@
- host - host
- name: create slave ssh directory - 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 file: path={{ slave_home }}/.ssh owner={{ slave_user }} group={{ slave_user }} mode=0700 state=directory
- name: install slave ssh private key - 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 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 - 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 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 - 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 }} 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 - name: generate buildslave service file
@ -38,4 +38,3 @@
- name: start and enable buildslave service - name: start and enable buildslave service
service: name=buildslave enabled=yes state=started service: name=buildslave enabled=yes state=started