diff --git a/modules/openstack_project/files/gerrit/acls/openstack-ci/devstack-gate.config b/modules/openstack_project/files/gerrit/acls/openstack-ci/devstack-gate.config
index 830c78258f..0a47ba4231 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack-ci/devstack-gate.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack-ci/devstack-gate.config
@@ -1,11 +1,10 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-ci-admins
label-Approved = +0..+1 group openstack-ci-admins
+[project]
+ state = active
[receive]
requireChangeId = true
- requireShortMessage = true
requireContributorAgreement = true
[submit]
mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-ci/gerrit-verification-status-plugin.config b/modules/openstack_project/files/gerrit/acls/openstack-ci/gerrit-verification-status-plugin.config
index 16b5f7251f..ba3957b9a2 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack-ci/gerrit-verification-status-plugin.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack-ci/gerrit-verification-status-plugin.config
@@ -1,5 +1,3 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Approved = +0..+1 group openstack-ci-admins
label-Code-Review = -2..+2 group openstack-ci-admins
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-ci/gerrit.config b/modules/openstack_project/files/gerrit/acls/openstack-ci/gerrit.config
index 82d1cfbe1c..0a2027aa0b 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack-ci/gerrit.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack-ci/gerrit.config
@@ -1,5 +1,4 @@
[access "refs/*"]
- owner = group Administrators
pushTag = group openstack-ci-core
create = group openstack-ci-core
[access "refs/for/refs/heads/upstream/*"]
@@ -15,6 +14,8 @@
pushMerge = group openstack-ci-core
pushTag = group openstack-ci-core
create = group openstack-ci-core
+[project]
+ state = active
[receive]
requireChangeId = true
[submit]
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-ci/git-review.config b/modules/openstack_project/files/gerrit/acls/openstack-ci/git-review.config
index d59b063b97..139aa42d16 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack-ci/git-review.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack-ci/git-review.config
@@ -1,12 +1,12 @@
[access "refs/*"]
- owner = group Administrators
pushTag = group openstack-ci-admins
create = group openstack-ci-admins
[access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-ci-admins
label-Approved = +0..+1 group openstack-ci-admins
+[project]
+ state = active
[receive]
requireChangeId = true
- requireShortMessage = true
[submit]
mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-ci/jenkins-job-builder.config b/modules/openstack_project/files/gerrit/acls/openstack-ci/jenkins-job-builder.config
index 75a9ff1788..e41e3402ce 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack-ci/jenkins-job-builder.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack-ci/jenkins-job-builder.config
@@ -1,5 +1,3 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Approved = +0..+1 group openstack-ci-admins
label-Code-Review = -2..+2 group openstack-ci-admins
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-ci/lodgeit.config b/modules/openstack_project/files/gerrit/acls/openstack-ci/lodgeit.config
index bade0199fa..bf70ae42af 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack-ci/lodgeit.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack-ci/lodgeit.config
@@ -1,8 +1,8 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-ci-core
label-Approved = +0..+1 group openstack-ci-core
+[project]
+ state = active
[receive]
requireChangeId = true
[submit]
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-ci/meetbot.config b/modules/openstack_project/files/gerrit/acls/openstack-ci/meetbot.config
index 7e076c86a0..0790483274 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack-ci/meetbot.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack-ci/meetbot.config
@@ -1,5 +1,4 @@
[access "refs/*"]
- owner = group Administrators
create = group openstack-ci-core
pushTag = group openstack-ci-core
[access "refs/heads/*"]
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-ci/nose-html-output.config b/modules/openstack_project/files/gerrit/acls/openstack-ci/nose-html-output.config
index 505d4f60b8..15178c9f39 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack-ci/nose-html-output.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack-ci/nose-html-output.config
@@ -1,5 +1,4 @@
[access "refs/*"]
- owner = group Administrators
create = group openstack-ci-core
pushTag = group openstack-ci-core
[access "refs/heads/*"]
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-ci/puppet-apparmor.config b/modules/openstack_project/files/gerrit/acls/openstack-ci/puppet-apparmor.config
index cbf6b50b00..6e93ed15a9 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack-ci/puppet-apparmor.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack-ci/puppet-apparmor.config
@@ -1,5 +1,3 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-ci-admins
label-Approved = +0..+1 group openstack-ci-admins
@@ -12,7 +10,6 @@
state = active
[receive]
requireChangeId = true
- requireShortMessage = true
[submit]
mergeContent = true
action = cherry pick
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-ci/puppet-dashboard.config b/modules/openstack_project/files/gerrit/acls/openstack-ci/puppet-dashboard.config
index cbf6b50b00..6e93ed15a9 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack-ci/puppet-dashboard.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack-ci/puppet-dashboard.config
@@ -1,5 +1,3 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-ci-admins
label-Approved = +0..+1 group openstack-ci-admins
@@ -12,7 +10,6 @@
state = active
[receive]
requireChangeId = true
- requireShortMessage = true
[submit]
mergeContent = true
action = cherry pick
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-ci/puppet-vcsrepo.config b/modules/openstack_project/files/gerrit/acls/openstack-ci/puppet-vcsrepo.config
index cbf6b50b00..6e93ed15a9 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack-ci/puppet-vcsrepo.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack-ci/puppet-vcsrepo.config
@@ -1,5 +1,3 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-ci-admins
label-Approved = +0..+1 group openstack-ci-admins
@@ -12,7 +10,6 @@
state = active
[receive]
requireChangeId = true
- requireShortMessage = true
[submit]
mergeContent = true
action = cherry pick
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-ci/pypi-mirror.config b/modules/openstack_project/files/gerrit/acls/openstack-ci/pypi-mirror.config
index 0140a99879..bf70ae42af 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack-ci/pypi-mirror.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack-ci/pypi-mirror.config
@@ -1,5 +1,3 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-ci-core
label-Approved = +0..+1 group openstack-ci-core
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-ci/zuul.config b/modules/openstack_project/files/gerrit/acls/openstack-ci/zuul.config
index 702a343b9b..f532ca8c49 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack-ci/zuul.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack-ci/zuul.config
@@ -1,5 +1,3 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-ci-admins
label-Approved = +0..+1 group openstack-ci-admins
@@ -7,7 +5,6 @@
state = active
[receive]
requireChangeId = true
- requireShortMessage = true
[submit]
mergeContent = true
action = cherry pick
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/devstack.config b/modules/openstack_project/files/gerrit/acls/openstack-dev/devstack.config
index f42eb25a0f..ec6d72cad8 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack-dev/devstack.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack-dev/devstack.config
@@ -1,5 +1,3 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group devstack-core
label-Approved = +0..+1 group devstack-core
@@ -8,6 +6,8 @@
label-Code-Review = -2..+2 group devstack-core
label-Code-Review = -1..+1 group Registered Users
label-Approved = +0..+1 group devstack-core
+[project]
+ state = active
[receive]
requireChangeId = true
requireContributorAgreement = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/openstack-nose.config b/modules/openstack_project/files/gerrit/acls/openstack-dev/openstack-nose.config
index 68e264f579..49b5e1a6f7 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack-dev/openstack-nose.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack-dev/openstack-nose.config
@@ -1,14 +1,13 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-nose-core
label-Approved = +0..+1 group openstack-nose-core
[access "refs/heads/milestone-proposed"]
label-Code-Review = -2..+2 group openstack-nose-drivers
label-Approved = +0..+1 group openstack-nose-drivers
+[project]
+ state = active
[receive]
requireChangeId = true
requireContributorAgreement = true
- requireShortMessage = true
[submit]
mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/openstack-qa.config b/modules/openstack_project/files/gerrit/acls/openstack-dev/openstack-qa.config
index 9b611e4d51..1c81fdcd9f 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack-dev/openstack-qa.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack-dev/openstack-qa.config
@@ -1,8 +1,8 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-qa-core
label-Approved = +0..+1 group openstack-qa-core
+[project]
+ state = active
[receive]
requireChangeId = true
requireContributorAgreement = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/pbr.config b/modules/openstack_project/files/gerrit/acls/openstack-dev/pbr.config
index 8a9866d182..139aa42d16 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack-dev/pbr.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack-dev/pbr.config
@@ -1,5 +1,4 @@
[access "refs/*"]
- owner = group Administrators
pushTag = group openstack-ci-admins
create = group openstack-ci-admins
[access "refs/heads/*"]
@@ -9,6 +8,5 @@
state = active
[receive]
requireChangeId = true
- requireShortMessage = true
[submit]
mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack-dev/sandbox.config b/modules/openstack_project/files/gerrit/acls/openstack-dev/sandbox.config
index d548b18dad..be6eecbbe7 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack-dev/sandbox.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack-dev/sandbox.config
@@ -1,11 +1,11 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-cla
label-Approved = +0..+1 group openstack-cla
[access "refs/heads/milestone-proposed"]
label-Code-Review = -2..+2 group openstack-cla
label-Approved = +0..+1 group openstack-cla
+[project]
+ state = active
[receive]
requireChangeId = true
requireContributorAgreement = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/api-site.config b/modules/openstack_project/files/gerrit/acls/openstack/api-site.config
index 24bb4f75a3..ccf0eb0b48 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/api-site.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/api-site.config
@@ -1,5 +1,3 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-doc-core
label-Approved = +0..+1 group openstack-doc-core
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/ceilometer.config b/modules/openstack_project/files/gerrit/acls/openstack/ceilometer.config
index 2034739cf4..7d51c8cad7 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/ceilometer.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/ceilometer.config
@@ -1,5 +1,4 @@
[access "refs/*"]
- owner = group Administrators
create = group ceilometer-drivers
pushTag = group ceilometer-drivers
[access "refs/heads/*"]
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/cinder.config b/modules/openstack_project/files/gerrit/acls/openstack/cinder.config
index 699916b2f7..38af663d02 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/cinder.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/cinder.config
@@ -1,5 +1,3 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group cinder-core
label-Approved = +0..+1 group cinder-core
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/compute-api.config b/modules/openstack_project/files/gerrit/acls/openstack/compute-api.config
index 2db5515373..2324f662c9 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/compute-api.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/compute-api.config
@@ -1,10 +1,10 @@
[access]
inheritFrom = API-Projects
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group nova-core
label-Approved = +0..+1 group nova-core
+[project]
+ state = active
[receive]
requireChangeId = true
requireContributorAgreement = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/glance.config b/modules/openstack_project/files/gerrit/acls/openstack/glance.config
index 9b68e6b41e..3328fc1ac2 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/glance.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/glance.config
@@ -1,11 +1,11 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group glance-core
label-Approved = +0..+1 group glance-core
[access "refs/heads/milestone-proposed"]
label-Code-Review = -2..+2 group glance-drivers
label-Approved = +0..+1 group glance-drivers
+[project]
+ state = active
[receive]
requireChangeId = true
requireContributorAgreement = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/horizon.config b/modules/openstack_project/files/gerrit/acls/openstack/horizon.config
index 2bcfa185cf..41930cc6ed 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/horizon.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/horizon.config
@@ -1,5 +1,3 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group horizon-core
label-Approved = +0..+1 group horizon-core
@@ -10,6 +8,8 @@
label-Code-Review = -2..+2 group horizon-core
label-Code-Review = -1..+1 group Registered Users
label-Approved = +0..+1 group horizon-core
+[project]
+ state = active
[receive]
requireChangeId = true
requireContributorAgreement = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/identity-api.config b/modules/openstack_project/files/gerrit/acls/openstack/identity-api.config
index bdf21a7059..45a24b032c 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/identity-api.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/identity-api.config
@@ -1,10 +1,10 @@
[access]
inheritFrom = API-Projects
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group keystone-core
label-Approved = +0..+1 group keystone-core
+[project]
+ state = active
[receive]
requireChangeId = true
requireContributorAgreement = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/image-api.config b/modules/openstack_project/files/gerrit/acls/openstack/image-api.config
index ae57b0e732..8763f577ec 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/image-api.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/image-api.config
@@ -1,10 +1,10 @@
[access]
inheritFrom = API-Projects
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group glance-core
label-Approved = +0..+1 group glance-core
+[project]
+ state = active
[receive]
requireChangeId = true
requireContributorAgreement = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/keystone.config b/modules/openstack_project/files/gerrit/acls/openstack/keystone.config
index b453f84ca8..9e172776df 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/keystone.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/keystone.config
@@ -1,5 +1,3 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/for/refs/*"]
pushMerge = group keystone-drivers
[access "refs/heads/*"]
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/melange.config b/modules/openstack_project/files/gerrit/acls/openstack/melange.config
index ee4f2585c4..959fc0bae4 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/melange.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/melange.config
@@ -1,5 +1,3 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group melange-core
label-Approved = +0..+1 group melange-core
@@ -11,6 +9,8 @@
label-Code-Review = -1..+1 group Registered Users
label-Approved = +0..+1 group melange-core
exclusiveGroupPermissions = label-Code-Review label-Approved
+[project]
+ state = active
[receive]
requireChangeId = true
requireContributorAgreement = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/netconn-api.config b/modules/openstack_project/files/gerrit/acls/openstack/netconn-api.config
index 9d548bd573..36d6d75abc 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/netconn-api.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/netconn-api.config
@@ -1,10 +1,10 @@
[access]
inheritFrom = API-Projects
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group quantum-core
label-Approved = +0..+1 group quantum-core
+[project]
+ state = active
[receive]
requireChangeId = true
requireContributorAgreement = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/nova.config b/modules/openstack_project/files/gerrit/acls/openstack/nova.config
index 71a3be9517..9952d0a8ce 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/nova.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/nova.config
@@ -1,5 +1,3 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group nova-core
label-Approved = +0..+1 group nova-core
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/object-api.config b/modules/openstack_project/files/gerrit/acls/openstack/object-api.config
index 55aac947cf..73645f572a 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/object-api.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/object-api.config
@@ -1,10 +1,10 @@
[access]
inheritFrom = API-Projects
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group swift-core
label-Approved = +0..+1 group swift-core
+[project]
+ state = active
[receive]
requireChangeId = true
requireContributorAgreement = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/openstack-chef.config b/modules/openstack_project/files/gerrit/acls/openstack/openstack-chef.config
index 21b2f6a012..2ff092730a 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/openstack-chef.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/openstack-chef.config
@@ -1,8 +1,8 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-deploy-core
label-Approved = +0..+1 group openstack-deploy-core
+[project]
+ state = active
[receive]
requireChangeId = true
requireContributorAgreement = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/openstack-ci-puppet.config b/modules/openstack_project/files/gerrit/acls/openstack/openstack-ci-puppet.config
index 702a343b9b..f532ca8c49 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/openstack-ci-puppet.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/openstack-ci-puppet.config
@@ -1,5 +1,3 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-ci-admins
label-Approved = +0..+1 group openstack-ci-admins
@@ -7,7 +5,6 @@
state = active
[receive]
requireChangeId = true
- requireShortMessage = true
[submit]
mergeContent = true
action = cherry pick
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/openstack-ci.config b/modules/openstack_project/files/gerrit/acls/openstack/openstack-ci.config
index 830c78258f..0a47ba4231 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/openstack-ci.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/openstack-ci.config
@@ -1,11 +1,10 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-ci-admins
label-Approved = +0..+1 group openstack-ci-admins
+[project]
+ state = active
[receive]
requireChangeId = true
- requireShortMessage = true
requireContributorAgreement = true
[submit]
mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/openstack-manuals.config b/modules/openstack_project/files/gerrit/acls/openstack/openstack-manuals.config
index 3619d7a64d..ccf0eb0b48 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/openstack-manuals.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/openstack-manuals.config
@@ -1,5 +1,3 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-doc-core
label-Approved = +0..+1 group openstack-doc-core
@@ -8,6 +6,8 @@
label-Code-Review = -2..+2 group openstack-doc-core
label-Code-Review = -1..+1 group Registered Users
label-Approved = +0..+1 group openstack-doc-core
+[project]
+ state = active
[receive]
requireChangeId = true
requireContributorAgreement = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/openstack-planet.config b/modules/openstack_project/files/gerrit/acls/openstack/openstack-planet.config
index 6f5096197f..3c1eda0622 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/openstack-planet.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/openstack-planet.config
@@ -1,8 +1,8 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-admins
label-Approved = +0..+1 group openstack-admins
+[project]
+ state = active
[receive]
requireChangeId = true
requireContributorAgreement = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/openstack-puppet.config b/modules/openstack_project/files/gerrit/acls/openstack/openstack-puppet.config
index 21b2f6a012..2ff092730a 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/openstack-puppet.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/openstack-puppet.config
@@ -1,8 +1,8 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-deploy-core
label-Approved = +0..+1 group openstack-deploy-core
+[project]
+ state = active
[receive]
requireChangeId = true
requireContributorAgreement = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/oslo-incubator.config b/modules/openstack_project/files/gerrit/acls/openstack/oslo-incubator.config
index 5b64550f5f..bbd993d405 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/oslo-incubator.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/oslo-incubator.config
@@ -1,5 +1,3 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-common-core
label-Approved = +0..+1 group openstack-common-core
@@ -11,6 +9,5 @@
[receive]
requireChangeId = true
requireContributorAgreement = true
- requireShortMessage = true
[submit]
mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/quantum.config b/modules/openstack_project/files/gerrit/acls/openstack/quantum.config
index ca6700b79f..082914b41e 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/quantum.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/quantum.config
@@ -1,5 +1,4 @@
[access "refs/*"]
- owner = group Administrators
create = group Quantum Release Managers
pushTag = group Quantum Release Managers
[access "refs/heads/*"]
@@ -18,6 +17,8 @@
label-Code-Review = -2..+2 group quantum-core
label-Code-Review = -1..+1 group Registered Users
label-Approved = +0..+1 group quantum-core
+[project]
+ state = active
[receive]
requireChangeId = true
requireContributorAgreement = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/requirements.config b/modules/openstack_project/files/gerrit/acls/openstack/requirements.config
index d0c5c5d60d..bbd993d405 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/requirements.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/requirements.config
@@ -1,14 +1,13 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-common-core
label-Approved = +0..+1 group openstack-common-core
[access "refs/heads/milestone-proposed"]
label-Code-Review = -2..+2 group openstack-common-drivers
label-Approved = +0..+1 group openstack-common-drivers
+[project]
+ state = active
[receive]
requireChangeId = true
requireContributorAgreement = true
- requireShortMessage = true
[submit]
mergeContent = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/swift.config b/modules/openstack_project/files/gerrit/acls/openstack/swift.config
index 0d1708d08d..e11e09d178 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/swift.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/swift.config
@@ -1,11 +1,11 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group swift-core
label-Approved = +0..+1 group swift-core
[access "refs/heads/milestone-proposed"]
label-Code-Review = -2..+2 group swift-drivers
label-Approved = +0..+1 group swift-drivers
+[project]
+ state = active
[receive]
requireChangeId = true
requireContributorAgreement = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/tempest.config b/modules/openstack_project/files/gerrit/acls/openstack/tempest.config
index 9b611e4d51..1c81fdcd9f 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/tempest.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/tempest.config
@@ -1,8 +1,8 @@
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group openstack-qa-core
label-Approved = +0..+1 group openstack-qa-core
+[project]
+ state = active
[receive]
requireChangeId = true
requireContributorAgreement = true
diff --git a/modules/openstack_project/files/gerrit/acls/openstack/volume-api.config b/modules/openstack_project/files/gerrit/acls/openstack/volume-api.config
index 63d0e929d7..495e08c678 100644
--- a/modules/openstack_project/files/gerrit/acls/openstack/volume-api.config
+++ b/modules/openstack_project/files/gerrit/acls/openstack/volume-api.config
@@ -1,7 +1,5 @@
[access]
inheritFrom = API-Projects
-[access "refs/*"]
- owner = group Administrators
[access "refs/heads/*"]
label-Code-Review = -2..+2 group cinder-core
label-Approved = +0..+1 group cinder-core