From 285f884691e48ab8256fe0fbc9b346682909eb66 Mon Sep 17 00:00:00 2001 From: Ricardo Carrillo Cruz Date: Tue, 7 Jun 2016 11:27:46 +0000 Subject: [PATCH] Change the old meta puppetmaster group to the expected 'puppetmaster' group The code is switching from relying on metadata based groups to dynamically created groups with add_host. As such, the group containing puppetmaster is now 'puppetmaster'. Change-Id: Ic66a68fd7e873816ec27be37ce4842eea8268a47 --- bootstrap_puppet_infra_nodes.yml | 2 +- bootstrap_puppetmaster.yml | 2 +- roles/bootstrap_gerrit/tasks/main.yml | 2 +- roles/bootstrap_jjb/tasks/main.yml | 2 +- roles/bootstrap_puppet_infra_node/templates/puppet.conf.j2 | 2 +- roles/bootstrap_puppetmaster/templates/puppet.conf.j2 | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bootstrap_puppet_infra_nodes.yml b/bootstrap_puppet_infra_nodes.yml index 2ec7739..a40ebff 100644 --- a/bootstrap_puppet_infra_nodes.yml +++ b/bootstrap_puppet_infra_nodes.yml @@ -1,6 +1,6 @@ --- # file: bootstrap_puppet_infra_nodes.yml -- hosts: infra:!meta-infra_type_puppetmaster +- hosts: infra:!puppetmaster user: ubuntu become: true roles: diff --git a/bootstrap_puppetmaster.yml b/bootstrap_puppetmaster.yml index 7b78c13..e315cf7 100644 --- a/bootstrap_puppetmaster.yml +++ b/bootstrap_puppetmaster.yml @@ -1,6 +1,6 @@ --- # file: bootstrap_puppetmaster.yml -- hosts: meta-infra_type_puppetmaster +- hosts: puppetmaster gather_facts: no user: ubuntu become: true diff --git a/roles/bootstrap_gerrit/tasks/main.yml b/roles/bootstrap_gerrit/tasks/main.yml index 1197d60..b9687bf 100644 --- a/roles/bootstrap_gerrit/tasks/main.yml +++ b/roles/bootstrap_gerrit/tasks/main.yml @@ -1,7 +1,7 @@ --- - name: Fetch Gerrit MySQL password from Puppetmaster hiera command: hiera -c /etc/puppet/hiera.yaml gerrit_mysql_password environment=production - delegate_to: "{{ groups['meta-infra_type_puppetmaster'][0] }}" + delegate_to: "{{ groups['puppetmaster'][0] }}" register: gerrit_mysql_password no_log: True diff --git a/roles/bootstrap_jjb/tasks/main.yml b/roles/bootstrap_jjb/tasks/main.yml index 857edc5..f2247b7 100644 --- a/roles/bootstrap_jjb/tasks/main.yml +++ b/roles/bootstrap_jjb/tasks/main.yml @@ -4,7 +4,7 @@ - name: Get JJB password from Puppetmaster Hiera command: hiera -c /etc/puppet/hiera.yaml jenkins_jobs_password environment=production - delegate_to: "{{ groups['meta-infra_type_puppetmaster'][0] }}" + delegate_to: "{{ groups['puppetmaster'][0] }}" register: jenkins_jobs_password no_log: True diff --git a/roles/bootstrap_puppet_infra_node/templates/puppet.conf.j2 b/roles/bootstrap_puppet_infra_node/templates/puppet.conf.j2 index b7ffe61..fa9ac56 100644 --- a/roles/bootstrap_puppet_infra_node/templates/puppet.conf.j2 +++ b/roles/bootstrap_puppet_infra_node/templates/puppet.conf.j2 @@ -1,5 +1,5 @@ [main] -server={{ groups['meta-infra_type_puppetmaster'][0] }} +server={{ groups['puppetmaster'][0] }} certname={{ inventory_hostname }} logdir=/var/log/puppet vardir=/var/lib/puppet diff --git a/roles/bootstrap_puppetmaster/templates/puppet.conf.j2 b/roles/bootstrap_puppetmaster/templates/puppet.conf.j2 index b715800..fc6bf60 100644 --- a/roles/bootstrap_puppetmaster/templates/puppet.conf.j2 +++ b/roles/bootstrap_puppetmaster/templates/puppet.conf.j2 @@ -1,5 +1,5 @@ [main] -server={{ groups['meta-infra_type_puppetmaster'][0] }} +server={{ groups['puppetmaster'][0] }} certname={{ inventory_hostname }} logdir=/var/log/puppet vardir=/var/lib/puppet