From b81fc4bf50418c3a51d9e5d5b0881b83c0a673a0 Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 4 Apr 2013 23:20:18 +0000 Subject: [PATCH] A couple brown-bag fixes on project config errors. .../files/gerrit/acls/stackforge/python-savannaclient.config: Two lines were missing the group keyword. .../templates/review.projects.yaml.erb: Eight projects used acl_config instead of acl-config parameters. Change-Id: I60b2022e30230a133d52d3d0581e0760060ae7ca Reviewed-on: https://review.openstack.org/26170 Reviewed-by: James E. Blair Approved: Clark Boylan Reviewed-by: Clark Boylan Tested-by: Jenkins --- .../acls/stackforge/python-savannaclient.config | 4 ++-- .../templates/review.projects.yaml.erb | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/openstack_project/files/gerrit/acls/stackforge/python-savannaclient.config b/modules/openstack_project/files/gerrit/acls/stackforge/python-savannaclient.config index b104b3caf0..6ba2175acb 100644 --- a/modules/openstack_project/files/gerrit/acls/stackforge/python-savannaclient.config +++ b/modules/openstack_project/files/gerrit/acls/stackforge/python-savannaclient.config @@ -1,7 +1,7 @@ [access "refs/*"] owner = group Administrators - create = savanna-core - pushTag = savanna-core + create = group savanna-core + pushTag = group savanna-core [access "refs/heads/*"] label-Code-Review = -2..+2 group savanna-core label-Approved = +0..+1 group savanna-core diff --git a/modules/openstack_project/templates/review.projects.yaml.erb b/modules/openstack_project/templates/review.projects.yaml.erb index f54affabfc..5443d3a4b9 100644 --- a/modules/openstack_project/templates/review.projects.yaml.erb +++ b/modules/openstack_project/templates/review.projects.yaml.erb @@ -131,35 +131,35 @@ description: "Apply configuration from cloud metadata" - project: stackforge/puppet-cinder description: OpenStack Cinder Puppet Module - acl_config: /home/gerrit2/acls/stackforge/puppet-modules.config + acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config upstream: git://github.com/puppetlabs/puppetlabs-cinder.git - project: stackforge/puppet-glance description: OpenStack Glance Puppet Module - acl_config: /home/gerrit2/acls/stackforge/puppet-modules.config + acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config upstream: git://github.com/puppetlabs/puppetlabs-glance.git - project: stackforge/puppet-horizon description: OpenStack Horizon Puppet Module - acl_config: /home/gerrit2/acls/stackforge/puppet-modules.config + acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config upstream: git://github.com/puppetlabs/puppetlabs-horizon.git - project: stackforge/puppet-keystone description: OpenStack Keystone Puppet Module - acl_config: /home/gerrit2/acls/stackforge/puppet-modules.config + acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config upstream: git://github.com/puppetlabs/puppetlabs-keystone.git - project: stackforge/puppet-nova description: OpenStack Nova Puppet Module - acl_config: /home/gerrit2/acls/stackforge/puppet-modules.config + acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config upstream: git://github.com/puppetlabs/puppetlabs-nova.git - project: stackforge/puppet-openstack description: OpenStack Examples Puppet Module - acl_config: /home/gerrit2/acls/stackforge/puppet-modules.config + acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config upstream: git://github.com/puppetlabs/puppetlabs-openstack.git - project: stackforge/puppet-openstack_dev_env description: OpenStack Puppet Dev Environment - acl_config: /home/gerrit2/acls/stackforge/puppet-modules.config + acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config upstream: git://github.com/puppetlabs/puppetlabs-openstack_dev_env.git - project: stackforge/puppet-swift description: OpenStack Swift Puppet Module - acl_config: /home/gerrit2/acls/stackforge/puppet-modules.config + acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config upstream: git://github.com/puppetlabs/puppetlabs-swift.git - project: stackforge/opencafe upstream: https://github.com/samu4924/opencafe