Merge "Fix fuel repos layout"

modules/openstack_project/files/gerrit/acls/stackforge/fuel-main.config

@@ -1,12 +0,0 @@
-[access "refs/heads/*"]
-        label-Code-Review = -2..+2 group fuel-core
-        label-Approved = +0..+1 group fuel-core
-        workInProgress = group fuel-core
-[access "refs/tags/*"]
-        create = group fuel-core
-        pushTag = group fuel-core
-[receive]
-        requireChangeId = true
-        requireContributorAgreement = true
-[submit]
-        mergeContent = true

modules/openstack_project/files/gerrit/acls/stackforge/fuel-ostf-plugin.config

@@ -1,12 +0,0 @@
-[access "refs/heads/*"]
-        label-Code-Review = -2..+2 group fuel-core
-        label-Approved = +0..+1 group fuel-core
-        workInProgress = group fuel-core
-[access "refs/tags/*"]
-        create = group fuel-core
-        pushTag = group fuel-core
-[receive]
-        requireChangeId = true
-        requireContributorAgreement = true
-[submit]
-        mergeContent = true

modules/openstack_project/files/gerrit/acls/stackforge/fuel-ostf-tests.config

@@ -1,12 +0,0 @@
-[access "refs/heads/*"]
-        label-Code-Review = -2..+2 group fuel-core
-        label-Approved = +0..+1 group fuel-core
-        workInProgress = group fuel-core
-[access "refs/tags/*"]
-        create = group fuel-core
-        pushTag = group fuel-core
-[receive]
-        requireChangeId = true
-        requireContributorAgreement = true
-[submit]
-        mergeContent = true

modules/openstack_project/files/gerrit/acls/stackforge/fuel-web.config

@@ -1,12 +0,0 @@
-[access "refs/heads/*"]
-        label-Code-Review = -2..+2 group fuel-core
-        label-Approved = +0..+1 group fuel-core
-        workInProgress = group fuel-core
-[access "refs/tags/*"]
-        create = group fuel-core
-        pushTag = group fuel-core
-[receive]
-        requireChangeId = true
-        requireContributorAgreement = true
-[submit]
-        mergeContent = true

modules/openstack_project/files/zuul/layout.yaml

@@ -3198,7 +3198,7 @@ projects:
     gate:
       - gate-noop
 
-  - name: stackforge/fuel-ostf-tests
+  - name: stackforge/fuel-ostf
     check:
       - gate-noop
     gate:

modules/openstack_project/templates/review.projects.yaml.erb

@@ -407,16 +407,21 @@
 - project: stackforge/fuel-main
   description: "Fuel is the control plane for installing and managing OpenStack. It is capable of doing bare metal provisioning of physical nodes, installing OpenStack on them, and much more."
   upstream: git://github.com/Mirantis/fuel-main.git
+  acl-config: /home/gerrit2/acls/stackforge/fuel.config
 - project: stackforge/fuel-web
   description: Fuel UI
   upstream: git://github.com/Mirantis/fuelweb.git
+  acl-config: /home/gerrit2/acls/stackforge/fuel.config
 - project: stackforge/fuel-astute
   description: Fuel orchestrator
   upstream: git://github.com/Mirantis/astute.git
-- project: stackforge/fuel-ostf-tests
+  acl-config: /home/gerrit2/acls/stackforge/fuel.config
+- project: stackforge/fuel-ostf
   upstream: git://github.com/Mirantis/fuel-ostf-tests.git
+  acl-config: /home/gerrit2/acls/stackforge/fuel.config
 - project: stackforge/fuel-ostf-plugin
-  upstream: git://github.com/Mirantis/fuel-ostf-plugin.git
+  description: "Obsolete repo, please, take a look at fuel-ostf"
+  acl-config: /home/gerrit2/acls/stackforge/fuel.config
 - project: stackforge/manila
   description: "Shared filesystem management project for OpenStack."
   upstream: git://github.com/bswartz/manila.git