Point all puppet projects at puppet-system.config

The differences between these files are marginal and for most
projects they were just copying each other directly

The only anomaly of note is puppet-yum with:

requireContributorAgreement = true

But it's unclear to me whether we actually want this, so I lumped
this in with the rest of the acl merge.

Change-Id: Iae0b0e93ab66b7ecc3a9f8fa3c355b241bd39e27

gerrit/acls/openstack-infra/puppet-apparmor.config

@@ -1,17 +0,0 @@
-[access "refs/heads/*"]
-abandon = group infra-core
-label-Code-Review = -2..+2 group infra-core
-label-Workflow = -1..+1 group infra-core
-
-[access "refs/meta/config"]
-abandon = group infra-core
-label-Code-Review = -2..+2 group infra-core
-label-Verified = -2..+2 group infra-core
-label-Workflow = -1..+1 group infra-core
-submit = group infra-core
-
-[receive]
-requireChangeId = true
-
-[submit]
-mergeContent = true

gerrit/acls/openstack-infra/puppet-dashboard.config

@@ -1,17 +0,0 @@
-[access "refs/heads/*"]
-abandon = group infra-core
-label-Code-Review = -2..+2 group infra-core
-label-Workflow = -1..+1 group infra-core
-
-[access "refs/meta/config"]
-abandon = group infra-core
-label-Code-Review = -2..+2 group infra-core
-label-Verified = -2..+2 group infra-core
-label-Workflow = -1..+1 group infra-core
-submit = group infra-core
-
-[receive]
-requireChangeId = true
-
-[submit]
-mergeContent = true

gerrit/acls/openstack-infra/puppet-storyboard.config

@@ -1,10 +0,0 @@
-[access "refs/heads/*"]
-abandon = group infra-core
-label-Code-Review = -2..+2 group infra-core
-label-Workflow = -1..+1 group infra-core
-
-[receive]
-requireChangeId = true
-
-[submit]
-mergeContent = true

gerrit/acls/openstack-infra/puppet-vcsrepo.config

@@ -1,20 +0,0 @@
-[access "refs/heads/*"]
-abandon = group infra-core
-label-Code-Review = -2..+2 group infra-core
-label-Workflow = -1..+1 group infra-core
-
-[access "refs/meta/config"]
-abandon = group infra-core
-label-Code-Review = -2..+2 group infra-core
-label-Verified = -2..+2 group infra-core
-label-Workflow = -1..+1 group infra-core
-submit = group infra-core
-
-[access "refs/tags/*"]
-pushSignedTag = group infra-core
-
-[receive]
-requireChangeId = true
-
-[submit]
-mergeContent = true

gerrit/acls/openstack-infra/puppet-vinz.config

@@ -1,10 +0,0 @@
-[access "refs/heads/*"]
-abandon = group infra-core
-label-Code-Review = -2..+2 group infra-core
-label-Workflow = -1..+1 group infra-core
-
-[receive]
-requireChangeId = true
-
-[submit]
-mergeContent = true

gerrit/acls/openstack-infra/puppet-yum.config

@@ -1,14 +0,0 @@
-[access "refs/heads/*"]
-abandon = group infra-core
-label-Code-Review = -2..+2 group infra-core
-label-Workflow = -1..+1 group infra-core
-
-[access "refs/tags/*"]
-pushSignedTag = group infra-core
-
-[receive]
-requireChangeId = true
-requireContributorAgreement = true
-
-[submit]
-mergeContent = true

gerrit/acls/openstack-infra/puppet-zuul.config

@@ -1,10 +0,0 @@
-[access "refs/heads/*"]
-abandon = group infra-core
-label-Code-Review = -2..+2 group infra-core
-label-Workflow = -1..+1 group infra-core
-
-[receive]
-requireChangeId = true
-
-[submit]
-mergeContent = true

gerrit/projects.yaml

@@ -175,9 +175,11 @@
   options:
     - direct-release
 - project: openstack-infra/puppet-apparmor
+  acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
   groups:
     - openstack-ci
 - project: openstack-infra/puppet-dashboard
+  acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
   groups:
     - openstack-ci
 - project: openstack-infra/puppet-pip
@@ -188,22 +190,27 @@
     - openstack-ci
 - project: openstack-infra/puppet-storyboard
   description: Puppet module to deploy storyboard
+  acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
   use-storyboard: true
   groups:
     - openstack-ci
     - storyboard
 - project: openstack-infra/puppet-vcsrepo
+  acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
   groups:
     - openstack-ci
 - project: openstack-infra/puppet-vinz
   description: Puppet module to deploy vinz
+  acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
   groups:
     - openstack-ci
 - project: openstack-infra/puppet-yum
+  acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
   groups:
     - openstack-ci
   upstream: git://github.com/dprince/puppet-yum.git
 - project: openstack-infra/puppet-zuul
+  acl-config: /home/gerrit2/acls/openstack-infra/puppet-system.config
   description: Puppet module to install and configure zuul
   groups:
     - openstack-ci