From b3bb41ea3d3ce25358e0e8019ccef7adb6bebafb Mon Sep 17 00:00:00 2001
From: adreznec <adreznec@us.ibm.com>
Date: Tue, 28 Jul 2015 13:56:59 -0500
Subject: [PATCH] Rename & move neutron-powervm to networking-powervm

In accordance with the new Neutron Stadium effort, change to move
stackforge/neutron-powervm to networking-powervm under the openstack
namespace.

Related Governance change: Id971c75e28c7b7ca3081555b195278a40627bcb5

Change-Id: I925011e1916bb5096c611c4c1f58e9d89a0f2717
---
 gerrit/acls/openstack/networking-powervm.config | 15 +++++++++++++++
 gerrit/acls/stackforge/neutron-powervm.config   | 15 ---------------
 gerrit/projects.yaml                            |  5 ++---
 jenkins/jobs/projects.yaml                      | 16 ++++++++--------
 zuul/layout.yaml                                | 10 +++++-----
 5 files changed, 30 insertions(+), 31 deletions(-)
 create mode 100644 gerrit/acls/openstack/networking-powervm.config
 delete mode 100644 gerrit/acls/stackforge/neutron-powervm.config

diff --git a/gerrit/acls/openstack/networking-powervm.config b/gerrit/acls/openstack/networking-powervm.config
new file mode 100644
index 0000000000..f802b2a3b7
--- /dev/null
+++ b/gerrit/acls/openstack/networking-powervm.config
@@ -0,0 +1,15 @@
+[access "refs/heads/*"]
+abandon = group networking-powervm-core
+create = group networking-powervm-core
+label-Code-Review = -2..+2 group networking-powervm-core
+label-Workflow = -1..+1 group networking-powervm-core
+
+[access "refs/tags/*"]
+pushSignedTag = group networking-powervm-release
+
+[receive]
+requireChangeId = true
+requireContributorAgreement = true
+
+[submit]
+mergeContent = true
diff --git a/gerrit/acls/stackforge/neutron-powervm.config b/gerrit/acls/stackforge/neutron-powervm.config
deleted file mode 100644
index 1f25cb759b..0000000000
--- a/gerrit/acls/stackforge/neutron-powervm.config
+++ /dev/null
@@ -1,15 +0,0 @@
-[access "refs/heads/*"]
-abandon = group neutron-powervm-core
-create = group neutron-powervm-core
-label-Code-Review = -2..+2 group neutron-powervm-core
-label-Workflow = -1..+1 group neutron-powervm-core
-
-[access "refs/tags/*"]
-pushSignedTag = group neutron-powervm-release
-
-[receive]
-requireChangeId = true
-requireContributorAgreement = true
-
-[submit]
-mergeContent = true
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index c1c4c2f762..a14c0e1545 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -1208,6 +1208,8 @@
   description: Neutron integration with OVN
 - project: openstack/networking-plumgrid
   description: PLUMgrid driver for OpenStack Neutron
+- project: openstack/networking-powervm
+  description: Neutron drivers for PowerVM network management.
 - project: openstack/networking-sfc
   description: API's and implementations to support Service Function Chaining in Neutron.
 - project: openstack/networking-vsphere
@@ -2489,9 +2491,6 @@
 - project: stackforge/networking-zvm
   description: Implements zVM ML2 mechanism driver and zVM neutron agent for OpenStack
     Neutron.
-- project: stackforge/neutron-powervm
-  description: ML2 compatible PowerVM Shared Ethernet Adapter agent for OpenStack
-    Neutron
 - project: stackforge/neutron-salt-formula
   description: SaltStack formula used for installing OpenStack Neutron
   acl-config: /home/gerrit2/acls/stackforge/salt-formula.config
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index cbffab987b..e38af45316 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -917,6 +917,14 @@
     jobs:
       - python-jobs
 
+- project:
+    name: networking-powervm
+    node: 'bare-precise || bare-trusty'
+    tarball-site: tarballs.openstack.org
+
+    jobs:
+      - python-jobs
+
 - project:
     name: networking-sfc
     node: 'bare-precise || bare-trusty'
@@ -5761,14 +5769,6 @@
     jobs:
       - python-jobs
 
-- project:
-    name: neutron-powervm
-    node: 'bare-precise || bare-trusty'
-    tarball-site: tarballs.openstack.org
-
-    jobs:
-      - python-jobs
-
 - project:
     name: nova-docker
     node: 'bare-precise || bare-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 74067a16ce..a8303706df 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2692,6 +2692,11 @@ projects:
       - name: merge-check
       - name: python-jobs
 
+  - name: openstack/networking-powervm
+    template:
+      - name: merge-check
+      - name: python-jobs
+
   - name: openstack/networking-sfc
     template:
       - name: merge-check
@@ -7988,11 +7993,6 @@ projects:
       - name: merge-check
       - name: python-jobs
 
-  - name: stackforge/neutron-powervm
-    template:
-      - name: merge-check
-      - name: python-jobs
-
   - name: stackforge/neutron-salt-formula
     template:
       - name: merge-check