From 9d1db52a9106745e30c07f24a697f6661f9703df Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Tue, 7 Jun 2016 15:05:57 +0000 Subject: [PATCH] Change the old meta jenkins group to the expected 'jenkins' group 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 --- bootstrap_jjb.yml | 2 +- roles/bootstrap_puppetmaster/tasks/main.yml | 2 +- run_puppet_on_jenkins.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bootstrap_jjb.yml b/bootstrap_jjb.yml index 290fba6..d32bd91 100644 --- a/bootstrap_jjb.yml +++ b/bootstrap_jjb.yml @@ -1,5 +1,5 @@ --- -- hosts: meta-infra_type_jenkins +- hosts: jenkins gather_facts: no user: ubuntu become: true diff --git a/roles/bootstrap_puppetmaster/tasks/main.yml b/roles/bootstrap_puppetmaster/tasks/main.yml index e422fa0..c239d92 100644 --- a/roles/bootstrap_puppetmaster/tasks/main.yml +++ b/roles/bootstrap_puppetmaster/tasks/main.yml @@ -91,7 +91,7 @@ - name: Deploy Jenkins fqdn hiera file copy: > 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 service: name=puppet enabled=yes state=started diff --git a/run_puppet_on_jenkins.yml b/run_puppet_on_jenkins.yml index a239ea2..06799fc 100644 --- a/run_puppet_on_jenkins.yml +++ b/run_puppet_on_jenkins.yml @@ -1,5 +1,5 @@ --- -- hosts: meta-infra_type_jenkins +- hosts: jenkins user: ubuntu become: true name: Run Puppet to install Jenkins