From 925e0d662be7b234ad992f7c6620b63eb894d1f8 Mon Sep 17 00:00:00 2001 From: Sean McGinnis Date: Fri, 4 Jan 2019 05:34:31 -0600 Subject: [PATCH] Consolidate Cinder repo ACL settings The code repos under the Cinder team have the same ACL needs. Rather than maintaining nearly identical ACL configs for each one, this configures these repos to use the one common cinder.config file. This is also to pick up the Review-Priority flag for these other repos. Change-Id: Ib6fa6844399df54923b1b45726cc1eabeca12737 Signed-off-by: Sean McGinnis --- gerrit/acls/openstack/os-brick.config | 26 ------------------- .../python-brick-cinderclient-ext.config | 11 -------- .../acls/openstack/python-cinderclient.config | 26 ------------------- gerrit/projects.yaml | 3 +++ 4 files changed, 3 insertions(+), 63 deletions(-) delete mode 100644 gerrit/acls/openstack/os-brick.config delete mode 100644 gerrit/acls/openstack/python-brick-cinderclient-ext.config delete mode 100644 gerrit/acls/openstack/python-cinderclient.config diff --git a/gerrit/acls/openstack/os-brick.config b/gerrit/acls/openstack/os-brick.config deleted file mode 100644 index 63b4c7012b..0000000000 --- a/gerrit/acls/openstack/os-brick.config +++ /dev/null @@ -1,26 +0,0 @@ -[access "refs/heads/*"] -abandon = group cinder-core -label-Code-Review = -2..+2 group cinder-core -label-Workflow = -1..+1 group cinder-core - -[access "refs/heads/stable/*"] -abandon = group Change Owner -abandon = group Project Bootstrappers -abandon = group cinder-stable-maint -abandon = group stable-maint-core -exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers -label-Code-Review = -2..+2 group cinder-stable-maint -label-Code-Review = -2..+2 group stable-maint-core -label-Code-Review = -1..+1 group Registered Users -label-Workflow = -1..+0 group Change Owner -label-Workflow = -1..+1 group Project Bootstrappers -label-Workflow = -1..+1 group cinder-stable-maint -label-Workflow = -1..+1 group stable-maint-core - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/openstack/python-brick-cinderclient-ext.config b/gerrit/acls/openstack/python-brick-cinderclient-ext.config deleted file mode 100644 index 2d5ac32901..0000000000 --- a/gerrit/acls/openstack/python-brick-cinderclient-ext.config +++ /dev/null @@ -1,11 +0,0 @@ -[access "refs/heads/*"] -abandon = group cinder-core -label-Code-Review = -2..+2 group cinder-core -label-Workflow = -1..+1 group cinder-core - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/acls/openstack/python-cinderclient.config b/gerrit/acls/openstack/python-cinderclient.config deleted file mode 100644 index 63b4c7012b..0000000000 --- a/gerrit/acls/openstack/python-cinderclient.config +++ /dev/null @@ -1,26 +0,0 @@ -[access "refs/heads/*"] -abandon = group cinder-core -label-Code-Review = -2..+2 group cinder-core -label-Workflow = -1..+1 group cinder-core - -[access "refs/heads/stable/*"] -abandon = group Change Owner -abandon = group Project Bootstrappers -abandon = group cinder-stable-maint -abandon = group stable-maint-core -exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers -label-Code-Review = -2..+2 group cinder-stable-maint -label-Code-Review = -2..+2 group stable-maint-core -label-Code-Review = -1..+1 group Registered Users -label-Workflow = -1..+0 group Change Owner -label-Workflow = -1..+1 group Project Bootstrappers -label-Workflow = -1..+1 group cinder-stable-maint -label-Workflow = -1..+1 group stable-maint-core - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml index 3a290642f1..e550986fd0 100755 --- a/gerrit/projects.yaml +++ b/gerrit/projects.yaml @@ -5929,6 +5929,7 @@ description: Apply configuration from cloud metadata. - project: openstack/os-brick description: Volume discovery and local storage management lib + acl-config: /home/gerrit2/acls/openstack/cinder.config - project: openstack/os-client-config description: Unified config handling for client libraries and programs acl-config: /home/gerrit2/acls/openstack/openstacksdk.config @@ -6419,6 +6420,7 @@ acl-config: /home/gerrit2/acls/openstack/blazar.config - project: openstack/python-brick-cinderclient-ext description: python-cinderclient extension for local storage management + acl-config: /home/gerrit2/acls/openstack/cinder.config - project: openstack/python-ceilometerclient description: RETIRED, OpenStack Telemetry (Ceilometer) Client acl-config: /home/gerrit2/acls/openstack/retired.config @@ -6427,6 +6429,7 @@ acl-config: /home/gerrit2/acls/openstack/retired.config - project: openstack/python-cinderclient description: OpenStack Block Storage (Cinder) Client + acl-config: /home/gerrit2/acls/openstack/cinder.config - project: openstack/python-cloudkittyclient description: Python client library for CloudKitty API acl-config: /home/gerrit2/acls/openstack/cloudkitty.config