From 62416f2ea61a2355bfcf4719242df477ba16da3f Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Tue, 26 Aug 2014 13:01:33 -0400 Subject: [PATCH] Consolidate tripleo/os-apply-config ACL files The acls for os-cloud-config, os-collect-config and os-refresh-config all match exactly and are based off of the os-apply-config.config ACL file so lets just combine them. Change-Id: I02afae7218be10bc6f96c72f587b1f66af122d7d --- .../gerrit/acls/openstack/os-cloud-config.config | 14 -------------- .../gerrit/acls/openstack/os-collect-config.config | 14 -------------- .../gerrit/acls/openstack/os-refresh-config.config | 14 -------------- .../openstack_project/files/review.projects.yaml | 3 +++ 4 files changed, 3 insertions(+), 42 deletions(-) delete mode 100644 modules/openstack_project/files/gerrit/acls/openstack/os-cloud-config.config delete mode 100644 modules/openstack_project/files/gerrit/acls/openstack/os-collect-config.config delete mode 100644 modules/openstack_project/files/gerrit/acls/openstack/os-refresh-config.config diff --git a/modules/openstack_project/files/gerrit/acls/openstack/os-cloud-config.config b/modules/openstack_project/files/gerrit/acls/openstack/os-cloud-config.config deleted file mode 100644 index 6a4472cdcf..0000000000 --- a/modules/openstack_project/files/gerrit/acls/openstack/os-cloud-config.config +++ /dev/null @@ -1,14 +0,0 @@ -[access "refs/heads/*"] -abandon = group os-apply-config-core -label-Code-Review = -2..+2 group os-apply-config-core -label-Workflow = -1..+1 group os-apply-config-core - -[access "refs/tags/*"] -pushSignedTag = group tripleo-release - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack/os-collect-config.config b/modules/openstack_project/files/gerrit/acls/openstack/os-collect-config.config deleted file mode 100644 index 6a4472cdcf..0000000000 --- a/modules/openstack_project/files/gerrit/acls/openstack/os-collect-config.config +++ /dev/null @@ -1,14 +0,0 @@ -[access "refs/heads/*"] -abandon = group os-apply-config-core -label-Code-Review = -2..+2 group os-apply-config-core -label-Workflow = -1..+1 group os-apply-config-core - -[access "refs/tags/*"] -pushSignedTag = group tripleo-release - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/modules/openstack_project/files/gerrit/acls/openstack/os-refresh-config.config b/modules/openstack_project/files/gerrit/acls/openstack/os-refresh-config.config deleted file mode 100644 index 6a4472cdcf..0000000000 --- a/modules/openstack_project/files/gerrit/acls/openstack/os-refresh-config.config +++ /dev/null @@ -1,14 +0,0 @@ -[access "refs/heads/*"] -abandon = group os-apply-config-core -label-Code-Review = -2..+2 group os-apply-config-core -label-Workflow = -1..+1 group os-apply-config-core - -[access "refs/tags/*"] -pushSignedTag = group tripleo-release - -[receive] -requireChangeId = true -requireContributorAgreement = true - -[submit] -mergeContent = true diff --git a/modules/openstack_project/files/review.projects.yaml b/modules/openstack_project/files/review.projects.yaml index 639ab99eb8..e8c02e8726 100644 --- a/modules/openstack_project/files/review.projects.yaml +++ b/modules/openstack_project/files/review.projects.yaml @@ -350,10 +350,13 @@ description: Apply configuration from cloud metadata. - project: openstack/os-cloud-config description: Configure a cloud + acl-config: /home/gerrit2/acls/openstack/os-apply-config.config - project: openstack/os-collect-config description: Collect and cache metadata, run hooks on changes. + acl-config: /home/gerrit2/acls/openstack/os-apply-config.config - project: openstack/os-refresh-config description: Restart services and coordinate data migration on Heat config changes. + acl-config: /home/gerrit2/acls/openstack/os-apply-config.config - project: openstack/oslo-incubator group: oslo docimpact-group: openstack-manuals