x
/
infra-ansible
Code Issues Proposed changes

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

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

Change-Id: Ia1336382b489f16a18ca00a67f985d41aad57319
This commit is contained in:
Ricardo Carrillo Cruz 2016-06-07 14:36:03 +00:00
parent ba3b591b86
commit 8383944786
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,7 +86,7 @@
- name: Deploy Zuul fqdn hiera file - name: Deploy Zuul fqdn hiera file
copy: > copy: >
src=hiera/fqdn/zuul.yaml src=hiera/fqdn/zuul.yaml
dest=/etc/puppet/hieradata/production/fqdn/{{ groups['meta-infra_type_zuul'][0] }}.yaml dest=/etc/puppet/hieradata/production/fqdn/{{ groups['zuul'][0] }}.yaml
- name: Deploy Jenkins fqdn hiera file - name: Deploy Jenkins fqdn hiera file
copy: > copy: >

2
roles/bootstrap_puppetmaster/templates/puppet_profiles/zuul.pp.j2
View File

@ -7,7 +7,7 @@ class infra-ansible::profiles::zuul {
gerrit_server => '{{ groups['gerrit'][0] }}', gerrit_server => '{{ groups['gerrit'][0] }}',
gerrit_user => 'gerrit', gerrit_user => 'gerrit',
zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents'), zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents'),
zuul_url => 'http://{{ groups['meta-infra_type_zuul'][0] }}/p', zuul_url => 'http://{{ groups['zuul'][0] }}/p',
} }
class { '::zuul::server': class { '::zuul::server':

2
run_puppet_on_zuul.yml
View File

@ -1,5 +1,5 @@
--- ---
- hosts: meta-infra_type_zuul - hosts: zuul
user: ubuntu user: ubuntu
gather_facts: no gather_facts: no
become: true become: true