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

@@ -1,6 +1,6 @@
 ---
 # file: bootstrap_puppet_infra_nodes.yml
-- hosts: infra:!meta-infra_type_puppetmaster
+- hosts: infra:!puppetmaster
   user: ubuntu
   become: true
   roles:

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

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
 

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
 

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

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