x/infra-ansible
Code Issues Proposed changes

Change the old meta jenkins group to the expected 'jenkins' group

Browse Source 
The code is switching from relying on metadata based groups to
dynamically created groups with add_host.
As such, the group containing jenkins is now 'zuul'.

Change-Id: I5958a9fda04255daa028aaf779a208bd517d44a6
This commit is contained in:
Ricardo Carrillo Cruz 2016-06-07 15:05:57 +00:00
parent 8383944786
commit 9d1db52a91
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bootstrap_jjb.yml
View File

@ -1,5 +1,5 @@
--- ---
- hosts: meta-infra_type_jenkins - hosts: jenkins
gather_facts: no gather_facts: no
user: ubuntu user: ubuntu
become: true become: true

2
roles/bootstrap_puppetmaster/tasks/main.yml
View File

@ -91,7 +91,7 @@
- name: Deploy Jenkins fqdn hiera file - name: Deploy Jenkins fqdn hiera file
copy: > copy: >
src=hiera/fqdn/jenkins.yaml src=hiera/fqdn/jenkins.yaml
dest=/etc/puppet/hieradata/production/fqdn/{{ groups['meta-infra_type_jenkins'][0] }}.yaml dest=/etc/puppet/hieradata/production/fqdn/{{ groups['jenkins'][0] }}.yaml
- name: Start puppet agent service - name: Start puppet agent service
service: name=puppet enabled=yes state=started service: name=puppet enabled=yes state=started

2
run_puppet_on_jenkins.yml
View File

@ -1,5 +1,5 @@
--- ---
- hosts: meta-infra_type_jenkins - hosts: jenkins
user: ubuntu user: ubuntu
become: true become: true
name: Run Puppet to install Jenkins name: Run Puppet to install Jenkins