move the ssh key around for jenkins nodes - so it actually works
add tags for just running the master setup
This commit is contained in:
parent
9061bdd949
commit
6015ec593d
2 changed files with 7 additions and 3 deletions
|
@ -54,7 +54,7 @@ class="jenkins.model.ProjectNamingStrategy$DefaultProjectNamingStrategy"/>
|
||||||
<host>209.132.184.119</host>
|
<host>209.132.184.119</host>
|
||||||
<port>22</port>
|
<port>22</port>
|
||||||
<username>jenkins_slave</username>
|
<username>jenkins_slave</username>
|
||||||
<privatekey>/root/.ssh/id_rsa</privatekey>
|
<privatekey>/var/tmp/jenkins_master_id_rsa</privatekey>
|
||||||
</launcher>
|
</launcher>
|
||||||
<label></label>
|
<label></label>
|
||||||
<nodeProperties/>
|
<nodeProperties/>
|
||||||
|
@ -71,7 +71,7 @@ class="jenkins.model.ProjectNamingStrategy$DefaultProjectNamingStrategy"/>
|
||||||
<host>209.132.184.118</host>
|
<host>209.132.184.118</host>
|
||||||
<port>22</port>
|
<port>22</port>
|
||||||
<username>jenkins_slave</username>
|
<username>jenkins_slave</username>
|
||||||
<privatekey>/root/.ssh/id_rsa</privatekey>
|
<privatekey>/var/tmp/jenkins_master_id_rsa</privatekey>
|
||||||
</launcher>
|
</launcher>
|
||||||
<label></label>
|
<label></label>
|
||||||
<nodeProperties/>
|
<nodeProperties/>
|
||||||
|
|
|
@ -2,6 +2,8 @@
|
||||||
hosts: jenkins.cloud.fedoraproject.org
|
hosts: jenkins.cloud.fedoraproject.org
|
||||||
user: root
|
user: root
|
||||||
gather_facts: False
|
gather_facts: False
|
||||||
|
tags:
|
||||||
|
- jenkins_master
|
||||||
|
|
||||||
vars_files:
|
vars_files:
|
||||||
- /srv/web/infra/ansible/vars/global.yml
|
- /srv/web/infra/ansible/vars/global.yml
|
||||||
|
@ -14,6 +16,8 @@
|
||||||
hosts: jenkins.cloud.fedoraproject.org
|
hosts: jenkins.cloud.fedoraproject.org
|
||||||
user: root
|
user: root
|
||||||
gather_facts: True
|
gather_facts: True
|
||||||
|
tags:
|
||||||
|
- jenkins_master
|
||||||
|
|
||||||
vars_files:
|
vars_files:
|
||||||
- /srv/web/infra/ansible/vars/global.yml
|
- /srv/web/infra/ansible/vars/global.yml
|
||||||
|
@ -97,7 +101,7 @@
|
||||||
- config
|
- config
|
||||||
|
|
||||||
- name: add jenkins ssh priv key so it can connect to clients
|
- name: add jenkins ssh priv key so it can connect to clients
|
||||||
action: copy src=$private/files/jenkins/ssh/jenkins_master dest=/root/.ssh/id_rsa mode=600
|
action: copy src=$private/files/jenkins/ssh/jenkins_master dest=/var/tmp/jenkins_master_id_rsa mode=600
|
||||||
tags:
|
tags:
|
||||||
- config
|
- config
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue