From b0e5ba6e7eed09bc8722cd679e578df3a8b5a8af Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Mon, 9 Jan 2017 10:03:36 -0500 Subject: [PATCH] update aclmanager to use default series argument Instead of requiring the series argument, look at the default that the rest of the scripts use. There is still a command line option for overriding the default. Change-Id: I7168b4786ac8f275da1ff0cd177268b3a4c20c17 Signed-off-by: Doug Hellmann --- PROCESS.rst | 4 ++-- README.rst | 2 +- tools/aclmanager.py | 12 ++++++------ 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/PROCESS.rst b/PROCESS.rst index 9fa5f4443e..5997c0d536 100644 --- a/PROCESS.rst +++ b/PROCESS.rst @@ -81,14 +81,14 @@ Between Milestone-2 and Milestone-3 generated (for all release:cycle-with-milestones deliverables) with:: - tox -e aclmanager -- acls /path/to/openstack-infra/project-config $series + tox -e aclmanager -- acls /path/to/openstack-infra/project-config 2. Set the population of all $project-release-branch groups to the "Release Managers" group and $project-release. This can be done (for all release:cycle-with-milestones deliverables) by running ``aclmanager.py``:: - tox -e aclmanager -- groups pre_release $series $user + tox -e aclmanager -- groups pre_release $user ($user being your Gerrit username) diff --git a/README.rst b/README.rst index f00c38ea6e..230780ea0d 100644 --- a/README.rst +++ b/README.rst @@ -483,7 +483,7 @@ To create the ACL patch for stable/newton: :: - tox -e aclmanager -- acls ~/branches/openstack-infra/project-config newton + tox -e aclmanager -- --series newton acls ~/branches/openstack-infra/project-config To set the pre-release group membership: diff --git a/tools/aclmanager.py b/tools/aclmanager.py index 5dfa94beb1..ca7d1fc704 100755 --- a/tools/aclmanager.py +++ b/tools/aclmanager.py @@ -27,6 +27,7 @@ from requests.packages import urllib3 import yaml import openstack_releases +from openstack_releases import defaults from openstack_releases import deliverable # Turn of warnings about bad SSL config. @@ -183,6 +184,11 @@ def main(args=sys.argv[1:]): default=openstack_releases.deliverable_dir, help='location of deliverable files', ) + parser.add_argument( + '--series', + default=defaults.RELEASE, + help='release series to use for repo/team membership', + ) subparsers = parser.add_subparsers(title='commands') do_acls = subparsers.add_parser( @@ -191,9 +197,6 @@ def main(args=sys.argv[1:]): do_acls.add_argument( 'repository', help='location of the local project-config repository') - do_acls.add_argument( - 'series', - help='series to generate ACL for') do_acls.set_defaults(func=patch_acls) do_groups = subparsers.add_parser( @@ -203,9 +206,6 @@ def main(args=sys.argv[1:]): 'stage', choices=['pre_release', 'post_release'], help='type of modification to push') - do_groups.add_argument( - 'series', - help='series to modify groups for') do_groups.add_argument( 'username', help='gerrit HTTP username')