From 639ec1d17e77be63204ddce1851d179de27cd424 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Fri, 24 Apr 2015 01:06:04 +0000 Subject: [PATCH] There is no Project Bootstrappers-core... ...only Project Bootstrappers. Correct the ACL normalization script oversight which led to this unfortunate mistake, and clean up the resulting mess. Change-Id: I391ead734d0cd28277581d54f254718c3e36d4b0 --- gerrit/acls/openstack/barbican.config | 2 +- gerrit/acls/openstack/ceilometer.config | 2 +- gerrit/acls/openstack/cinder.config | 2 +- gerrit/acls/openstack/designate.config | 2 +- gerrit/acls/openstack/glance.config | 2 +- gerrit/acls/openstack/heat.config | 2 +- gerrit/acls/openstack/horizon.config | 2 +- gerrit/acls/openstack/ironic.config | 2 +- gerrit/acls/openstack/keystone.config | 2 +- gerrit/acls/openstack/manila.config | 2 +- gerrit/acls/openstack/neutron-fwaas.config | 2 +- gerrit/acls/openstack/neutron-lbaas.config | 2 +- gerrit/acls/openstack/neutron-vpnaas.config | 2 +- gerrit/acls/openstack/neutron.config | 2 +- gerrit/acls/openstack/nova.config | 2 +- gerrit/acls/openstack/sahara.config | 2 +- gerrit/acls/openstack/swift.config | 2 +- gerrit/acls/openstack/trove.config | 2 +- gerrit/acls/openstack/zaqar.config | 2 +- tools/normalize_acl.py | 1 + 20 files changed, 20 insertions(+), 19 deletions(-) diff --git a/gerrit/acls/openstack/barbican.config b/gerrit/acls/openstack/barbican.config index 24566907e4..b57ac20188 100644 --- a/gerrit/acls/openstack/barbican.config +++ b/gerrit/acls/openstack/barbican.config @@ -9,7 +9,7 @@ abandon = group Project Bootstrappers abandon = group Release Managers abandon = group barbican-release exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers-core +label-Code-Review = -2..+2 group Project Bootstrappers label-Code-Review = -2..+2 group Release Managers label-Code-Review = -2..+2 group barbican-release label-Code-Review = -1..+1 group Registered Users diff --git a/gerrit/acls/openstack/ceilometer.config b/gerrit/acls/openstack/ceilometer.config index 26fe88bd66..f5b39a97b7 100644 --- a/gerrit/acls/openstack/ceilometer.config +++ b/gerrit/acls/openstack/ceilometer.config @@ -16,7 +16,7 @@ abandon = group Project Bootstrappers abandon = group Release Managers abandon = group ceilometer-milestone exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers-core +label-Code-Review = -2..+2 group Project Bootstrappers label-Code-Review = -2..+2 group Release Managers label-Code-Review = -2..+2 group ceilometer-milestone label-Code-Review = -1..+1 group Registered Users diff --git a/gerrit/acls/openstack/cinder.config b/gerrit/acls/openstack/cinder.config index 05fd521eea..dc3a6fe69c 100644 --- a/gerrit/acls/openstack/cinder.config +++ b/gerrit/acls/openstack/cinder.config @@ -17,7 +17,7 @@ abandon = group Project Bootstrappers abandon = group Release Managers abandon = group cinder-milestone exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers-core +label-Code-Review = -2..+2 group Project Bootstrappers label-Code-Review = -2..+2 group Release Managers label-Code-Review = -2..+2 group cinder-milestone label-Code-Review = -1..+1 group Registered Users diff --git a/gerrit/acls/openstack/designate.config b/gerrit/acls/openstack/designate.config index d8494f4125..8cc7a68239 100644 --- a/gerrit/acls/openstack/designate.config +++ b/gerrit/acls/openstack/designate.config @@ -15,7 +15,7 @@ abandon = group Project Bootstrappers abandon = group Release Managers abandon = group designate-milestone exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers-core +label-Code-Review = -2..+2 group Project Bootstrappers label-Code-Review = -2..+2 group Release Managers label-Code-Review = -2..+2 group designate-milestone label-Code-Review = -1..+1 group Registered Users diff --git a/gerrit/acls/openstack/glance.config b/gerrit/acls/openstack/glance.config index 2e6c1f649f..168675a064 100644 --- a/gerrit/acls/openstack/glance.config +++ b/gerrit/acls/openstack/glance.config @@ -16,7 +16,7 @@ abandon = group Project Bootstrappers abandon = group Release Managers abandon = group glance-milestone exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers-core +label-Code-Review = -2..+2 group Project Bootstrappers label-Code-Review = -2..+2 group Release Managers label-Code-Review = -2..+2 group glance-milestone label-Code-Review = -1..+1 group Registered Users diff --git a/gerrit/acls/openstack/heat.config b/gerrit/acls/openstack/heat.config index fec0110dd6..69d7b29341 100644 --- a/gerrit/acls/openstack/heat.config +++ b/gerrit/acls/openstack/heat.config @@ -16,7 +16,7 @@ abandon = group Project Bootstrappers abandon = group Release Managers abandon = group heat-milestone exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers-core +label-Code-Review = -2..+2 group Project Bootstrappers label-Code-Review = -2..+2 group Release Managers label-Code-Review = -2..+2 group heat-milestone label-Code-Review = -1..+1 group Registered Users diff --git a/gerrit/acls/openstack/horizon.config b/gerrit/acls/openstack/horizon.config index e0a6e93275..a640e7c8be 100644 --- a/gerrit/acls/openstack/horizon.config +++ b/gerrit/acls/openstack/horizon.config @@ -17,7 +17,7 @@ abandon = group Project Bootstrappers abandon = group Release Managers abandon = group horizon-milestone exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers-core +label-Code-Review = -2..+2 group Project Bootstrappers label-Code-Review = -2..+2 group Release Managers label-Code-Review = -2..+2 group horizon-milestone label-Code-Review = -1..+1 group Registered Users diff --git a/gerrit/acls/openstack/ironic.config b/gerrit/acls/openstack/ironic.config index aba11848ff..42b58aac10 100644 --- a/gerrit/acls/openstack/ironic.config +++ b/gerrit/acls/openstack/ironic.config @@ -16,7 +16,7 @@ abandon = group Project Bootstrappers abandon = group Release Managers abandon = group ironic-milestone exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers-core +label-Code-Review = -2..+2 group Project Bootstrappers label-Code-Review = -2..+2 group Release Managers label-Code-Review = -2..+2 group ironic-milestone label-Code-Review = -1..+1 group Registered Users diff --git a/gerrit/acls/openstack/keystone.config b/gerrit/acls/openstack/keystone.config index 2704375f79..e8ab327394 100644 --- a/gerrit/acls/openstack/keystone.config +++ b/gerrit/acls/openstack/keystone.config @@ -19,7 +19,7 @@ abandon = group Project Bootstrappers abandon = group Release Managers abandon = group keystone-milestone exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers-core +label-Code-Review = -2..+2 group Project Bootstrappers label-Code-Review = -2..+2 group Release Managers label-Code-Review = -2..+2 group keystone-milestone label-Code-Review = -1..+1 group Registered Users diff --git a/gerrit/acls/openstack/manila.config b/gerrit/acls/openstack/manila.config index b10d2e4ead..79c0228dfd 100644 --- a/gerrit/acls/openstack/manila.config +++ b/gerrit/acls/openstack/manila.config @@ -17,7 +17,7 @@ abandon = group Project Bootstrappers abandon = group Release Managers abandon = group manila-release exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers-core +label-Code-Review = -2..+2 group Project Bootstrappers label-Code-Review = -2..+2 group Release Managers label-Code-Review = -2..+2 group manila-release label-Code-Review = -1..+1 group Registered Users diff --git a/gerrit/acls/openstack/neutron-fwaas.config b/gerrit/acls/openstack/neutron-fwaas.config index 93163af363..0f1dd81a3e 100644 --- a/gerrit/acls/openstack/neutron-fwaas.config +++ b/gerrit/acls/openstack/neutron-fwaas.config @@ -13,7 +13,7 @@ abandon = group Project Bootstrappers abandon = group Release Managers abandon = group neutron-milestone exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers-core +label-Code-Review = -2..+2 group Project Bootstrappers label-Code-Review = -2..+2 group Release Managers label-Code-Review = -2..+2 group neutron-milestone label-Code-Review = -1..+1 group Registered Users diff --git a/gerrit/acls/openstack/neutron-lbaas.config b/gerrit/acls/openstack/neutron-lbaas.config index 0ca3f812d5..c3fba765a4 100644 --- a/gerrit/acls/openstack/neutron-lbaas.config +++ b/gerrit/acls/openstack/neutron-lbaas.config @@ -13,7 +13,7 @@ abandon = group Project Bootstrappers abandon = group Release Managers abandon = group neutron-milestone exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers-core +label-Code-Review = -2..+2 group Project Bootstrappers label-Code-Review = -2..+2 group Release Managers label-Code-Review = -2..+2 group neutron-milestone label-Code-Review = -1..+1 group Registered Users diff --git a/gerrit/acls/openstack/neutron-vpnaas.config b/gerrit/acls/openstack/neutron-vpnaas.config index 596bf5fd84..d89ea400ca 100644 --- a/gerrit/acls/openstack/neutron-vpnaas.config +++ b/gerrit/acls/openstack/neutron-vpnaas.config @@ -13,7 +13,7 @@ abandon = group Project Bootstrappers abandon = group Release Managers abandon = group neutron-milestone exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers-core +label-Code-Review = -2..+2 group Project Bootstrappers label-Code-Review = -2..+2 group Release Managers label-Code-Review = -2..+2 group neutron-milestone label-Code-Review = -1..+1 group Registered Users diff --git a/gerrit/acls/openstack/neutron.config b/gerrit/acls/openstack/neutron.config index cac85984fa..7220946656 100644 --- a/gerrit/acls/openstack/neutron.config +++ b/gerrit/acls/openstack/neutron.config @@ -20,7 +20,7 @@ abandon = group Project Bootstrappers abandon = group Release Managers abandon = group neutron-milestone exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers-core +label-Code-Review = -2..+2 group Project Bootstrappers label-Code-Review = -2..+2 group Release Managers label-Code-Review = -2..+2 group neutron-milestone label-Code-Review = -1..+1 group Registered Users diff --git a/gerrit/acls/openstack/nova.config b/gerrit/acls/openstack/nova.config index 13d15ddb86..1e0b710154 100644 --- a/gerrit/acls/openstack/nova.config +++ b/gerrit/acls/openstack/nova.config @@ -17,7 +17,7 @@ abandon = group Project Bootstrappers abandon = group Release Managers abandon = group nova-milestone exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers-core +label-Code-Review = -2..+2 group Project Bootstrappers label-Code-Review = -2..+2 group Release Managers label-Code-Review = -2..+2 group nova-milestone label-Code-Review = -1..+1 group Registered Users diff --git a/gerrit/acls/openstack/sahara.config b/gerrit/acls/openstack/sahara.config index ad6b807c97..30a689f5d2 100644 --- a/gerrit/acls/openstack/sahara.config +++ b/gerrit/acls/openstack/sahara.config @@ -20,7 +20,7 @@ abandon = group Project Bootstrappers abandon = group Release Managers abandon = group sahara-milestone exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers-core +label-Code-Review = -2..+2 group Project Bootstrappers label-Code-Review = -2..+2 group Release Managers label-Code-Review = -2..+2 group sahara-milestone label-Code-Review = -1..+1 group Registered Users diff --git a/gerrit/acls/openstack/swift.config b/gerrit/acls/openstack/swift.config index 65712dcaed..3be6c91968 100644 --- a/gerrit/acls/openstack/swift.config +++ b/gerrit/acls/openstack/swift.config @@ -19,7 +19,7 @@ abandon = group Project Bootstrappers abandon = group Release Managers abandon = group swift-milestone exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers-core +label-Code-Review = -2..+2 group Project Bootstrappers label-Code-Review = -2..+2 group Release Managers label-Code-Review = -2..+2 group swift-milestone label-Code-Review = -1..+1 group Registered Users diff --git a/gerrit/acls/openstack/trove.config b/gerrit/acls/openstack/trove.config index 0e6473755d..7b537397ec 100644 --- a/gerrit/acls/openstack/trove.config +++ b/gerrit/acls/openstack/trove.config @@ -17,7 +17,7 @@ abandon = group Project Bootstrappers abandon = group Release Managers abandon = group trove-milestone exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers-core +label-Code-Review = -2..+2 group Project Bootstrappers label-Code-Review = -2..+2 group Release Managers label-Code-Review = -2..+2 group trove-milestone label-Code-Review = -1..+1 group Registered Users diff --git a/gerrit/acls/openstack/zaqar.config b/gerrit/acls/openstack/zaqar.config index 6ad72c9a34..d86940789b 100644 --- a/gerrit/acls/openstack/zaqar.config +++ b/gerrit/acls/openstack/zaqar.config @@ -16,7 +16,7 @@ abandon = group Project Bootstrappers abandon = group Release Managers abandon = group zaqar-milestone exclusiveGroupPermissions = abandon label-Code-Review label-Workflow -label-Code-Review = -2..+2 group Project Bootstrappers-core +label-Code-Review = -2..+2 group Project Bootstrappers label-Code-Review = -2..+2 group Release Managers label-Code-Review = -2..+2 group zaqar-milestone label-Code-Review = -1..+1 group Registered Users diff --git a/tools/normalize_acl.py b/tools/normalize_acl.py index c2a5265b59..3cff0d0cba 100755 --- a/tools/normalize_acl.py +++ b/tools/normalize_acl.py @@ -116,6 +116,7 @@ if '7' in transformations: ) special_teams = ( 'admins', + 'Bootstrappers', 'committee', 'core', 'maint',