From ba3b591b868414b50890bee939c6c552c357bf5a Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Tue, 7 Jun 2016 14:29:58 +0000 Subject: [PATCH] Change the old meta gerrit group to the expected 'gerrit' group The code is switching from relying on metadata based groups to dynamically created groups with add_host. As such, the group containing gerrit is now 'gerrit'. Change-Id: I235e445f9e0f7e94f52a0c9dfc0df80b55d49bc1 --- bootstrap_gerrit.yml | 2 +- roles/bootstrap_puppetmaster/tasks/main.yml | 2 +- .../bootstrap_puppetmaster/templates/puppet_profiles/zuul.pp.j2 | 2 +- run_puppet_on_gerrit.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bootstrap_gerrit.yml b/bootstrap_gerrit.yml index bfd82cd..4df944e 100644 --- a/bootstrap_gerrit.yml +++ b/bootstrap_gerrit.yml @@ -1,6 +1,6 @@ --- # file: boostrap_gerrit.yml -- hosts: meta-infra_type_gerrit +- hosts: gerrit gather_facts: no user: ubuntu become: true diff --git a/roles/bootstrap_puppetmaster/tasks/main.yml b/roles/bootstrap_puppetmaster/tasks/main.yml index 762f73d..0c3e5d2 100644 --- a/roles/bootstrap_puppetmaster/tasks/main.yml +++ b/roles/bootstrap_puppetmaster/tasks/main.yml @@ -81,7 +81,7 @@ - name: Deploy Gerrit fqdn hiera file copy: > src=hiera/fqdn/gerrit.yaml - dest=/etc/puppet/hieradata/production/fqdn/{{ groups['meta-infra_type_gerrit'][0] }}.yaml + dest=/etc/puppet/hieradata/production/fqdn/{{ groups['gerrit'][0] }}.yaml - name: Deploy Zuul fqdn hiera file copy: > diff --git a/roles/bootstrap_puppetmaster/templates/puppet_profiles/zuul.pp.j2 b/roles/bootstrap_puppetmaster/templates/puppet_profiles/zuul.pp.j2 index 772e972..7d7f46b 100644 --- a/roles/bootstrap_puppetmaster/templates/puppet_profiles/zuul.pp.j2 +++ b/roles/bootstrap_puppetmaster/templates/puppet_profiles/zuul.pp.j2 @@ -4,7 +4,7 @@ class infra-ansible::profiles::zuul { } class { '::zuul': - gerrit_server => '{{ groups['meta-infra_type_gerrit'][0] }}', + gerrit_server => '{{ groups['gerrit'][0] }}', gerrit_user => 'gerrit', zuul_ssh_private_key => hiera('zuul_ssh_private_key_contents'), zuul_url => 'http://{{ groups['meta-infra_type_zuul'][0] }}/p', diff --git a/run_puppet_on_gerrit.yml b/run_puppet_on_gerrit.yml index 8a9b690..33848e7 100644 --- a/run_puppet_on_gerrit.yml +++ b/run_puppet_on_gerrit.yml @@ -1,5 +1,5 @@ --- -- hosts: meta-infra_type_gerrit +- hosts: gerrit user: ubuntu gather_facts: no become: true