From d68cb0bcbf9c59333caf2f58e5264c81f8fab469 Mon Sep 17 00:00:00 2001 From: "James E. Blair" Date: Thu, 7 Mar 2013 08:10:49 -0800 Subject: [PATCH] Replace acl_config with acl-config in docs. Change-Id: I8f7c8b0800da37a7e9b97e75571a03ac14214374 Reviewed-on: https://review.openstack.org/23823 Reviewed-by: Jeremy Stanley Approved: Clark Boylan Reviewed-by: Clark Boylan Tested-by: Jenkins --- doc/source/gerrit.rst | 8 ++++---- doc/source/stackforge.rst | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/source/gerrit.rst b/doc/source/gerrit.rst index 4c799f072a..444aa0d73d 100644 --- a/doc/source/gerrit.rst +++ b/doc/source/gerrit.rst @@ -622,11 +622,11 @@ Note The gerrit-user 'example-project-creator' should be added to the - project: example/project1 description: Best project ever. has-wiki: True - acl_config: /path/to/acl/file + acl-config: /path/to/acl/file The above config gives puppet and its related scripts enough information to create new projects, but not enough to add access controls to each -project. To add access control you need to have have an ``acl_config`` +project. To add access control you need to have have an ``acl-config`` option for the project in ``review.projects.yaml.erb`` file. That option should have a value that is a path to the project.config for that project. @@ -661,7 +661,7 @@ a single project you will want to do the following: ``openstack-infra/config:modules/openstack_project/templates/review.projects.yaml.erb``.:: - project: openstack/project-name - acl_config: /home/gerrit2/acls/project-name.config + acl-config: /home/gerrit2/acls/project-name.config #. If there is an existing repo that is being replaced by this new project you can set the upstream value for the project. When an @@ -669,7 +669,7 @@ a single project you will want to do the following: instead of an empty repository. eg:: - project: openstack/project-name - acl_config: /home/gerrit2/acls/project-name.config + acl-config: /home/gerrit2/acls/project-name.config upstream: git://github.com/awesumsauce/project-name.git That is all you need to do. Push the change to gerrit and if necessary diff --git a/doc/source/stackforge.rst b/doc/source/stackforge.rst index b1821be457..b8993f23d3 100644 --- a/doc/source/stackforge.rst +++ b/doc/source/stackforge.rst @@ -55,13 +55,13 @@ look something like:: - project: stackforge/project-name description: Latest and greatest cloud stuff. - acl_config: /home/gerrit2/acls/stackforge/project-name.config + acl-config: /home/gerrit2/acls/stackforge/project-name.config upstream: git://github.com/awesumsauce/project-name.git The description will set the project description on the GitHub StackForge mirror, and the upstream should point at an existing repository that should be used to preseed Gerrit. Both of these options -are optional, but you must have an acl_config. Note that the current +are optional, but you must have an acl-config. Note that the current tools assume that the upstream repo will have a master branch. The next step is to add a Gerrit ACL config file. Edit