Normalize Gerrit ACLs

This is the result of running:

    find gerrit/acls/ -type f -name "*.config" \
        -exec ./tools/normalize_acl.py {} 1 2 3 4 5 6 \;

Change-Id: Icc447d5c413008138c88daba6fe8e1bd72bfe65e

gerrit/acls/openstack-infra/subunit2sql.config

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

gerrit/acls/openstack/designate.config

@@ -3,18 +3,18 @@ abandon = group designate-core
 label-Code-Review = -2..+2 group designate-core
 label-Workflow = -1..+1 group designate-core
 
-[access "refs/heads/stable/*"]
-create = group designate-release
-label-Code-Review = -2..+2 group openstack-stable-maint
-label-Code-Review = -2..+2 group designate-milestone
-label-Workflow = -1..+1 group openstack-stable-maint
-label-Workflow = -1..+1 group designate-milestone
-
 [access "refs/heads/proposed/*"]
 abandon = group designate-milestone
 label-Code-Review = -2..+2 group designate-milestone
 label-Workflow = -1..+1 group designate-milestone
 
+[access "refs/heads/stable/*"]
+create = group designate-release
+label-Code-Review = -2..+2 group designate-milestone
+label-Code-Review = -2..+2 group openstack-stable-maint
+label-Workflow = -1..+1 group designate-milestone
+label-Workflow = -1..+1 group openstack-stable-maint
+
 [receive]
 requireChangeId = true
 requireContributorAgreement = true

gerrit/acls/openstack/ha-guide.config

@@ -1,6 +1,6 @@
 [access "refs/heads/*"]
 abandon = group ha-guide-core
-label-Code-Review =  -2..+2 group ha-guide-core
+label-Code-Review = -2..+2 group ha-guide-core
 label-Workflow = -1..+1 group ha-guide-core
 
 [receive]

gerrit/acls/openstack/oslo.concurrency.config

@@ -1,7 +1,7 @@
 [access "refs/heads/*"]
+abandon = group oslo-concurrency-core
 label-Code-Review = -2..+2 group oslo-concurrency-core
 label-Workflow = -1..+1 group oslo-concurrency-core
-abandon = group oslo-concurrency-core
 
 [access "refs/tags/*"]
 pushSignedTag = group oslo-concurrency-release

gerrit/acls/openstack/pylockfile.config

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

gerrit/acls/openstack/sahara.config

@@ -1,3 +1,6 @@
+[access "^refs/tags/2014\.1\.[0-9]+[.0-9]*"]
+pushSignedTag = group sahara-release
+
 [access "refs/heads/*"]
 abandon = group sahara-core
 label-Code-Review = -2..+2 group sahara-core
@@ -15,9 +18,6 @@ label-Code-Review = -2..+2 group sahara-core
 label-Code-Review = -1..+1 group Registered Users
 label-Workflow = -1..+1 group sahara-core
 
-[access "^refs/tags/2014\.1\.[0-9]+[.0-9]*"]
-pushSignedTag = group sahara-release
-
 [receive]
 requireChangeId = true
 requireContributorAgreement = true

gerrit/acls/stackforge/freezer.config

@@ -1,11 +1,11 @@
-[access "refs/tags/*"]
-pushSignedTag = group freezer-release
-
 [access "refs/heads/*"]
 abandon = group freezer-core
 label-Code-Review = -2..+2 group freezer-core
 label-Workflow = -1..+1 group freezer-core
 
+[access "refs/tags/*"]
+pushSignedTag = group freezer-release
+
 [receive]
 requireChangeId = true
 requireContributorAgreement = true

gerrit/acls/stackforge/poppy.config

@@ -11,4 +11,4 @@ requireChangeId = true
 requireContributorAgreement = true
 
 [submit]
-mergeContent = true
+mergeContent = true

gerrit/acls/stackforge/python-congressclient.config

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

gerrit/acls/stackforge/rack.config

@@ -1,7 +1,7 @@
 [access "refs/heads/*"]
+abandon = group rack-core
 label-Code-Review = -2..+2 group rack-core
 label-Workflow = -1..+1 group rack-core
-abandon = group rack-core
 
 [access "refs/tags/*"]
 pushSignedTag = group rack-release

gerrit/acls/stackforge/swiftonfile.config

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

gerrit/acls/stackforge/swiftpolicy.config

@@ -1,10 +1,9 @@
 [access "refs/heads/*"]
+abandon = group swiftpolicy-core
 label-Code-Review = -2..+2 group swiftpolicy-core
 label-Workflow = -1..+1 group swiftpolicy-core
-abandon = group swiftpolicy-core
 
 [access "refs/tags/*"]
-create = group swiftpolicy-release
 pushTag = group swiftpolicy-release
 
 [receive]

gerrit/acls/stackforge/tuskar-ui-extras.config

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

gerrit/acls/stackforge/xstatic.config

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