Move marconi under openstack

Marconi was recently accepted as an incubated project and as part of its
incubation, it's being moved under the openstack organization.

Meeting logs:
http://eavesdrop.openstack.org/meetings/tc/2013/tc.2013-09-03-20.01.html

Change-Id: Ie7c40be5f9cb3bdaec8dfcdf5f4c0f5e26b1ebad

modules/gerritbot/files/gerritbot_channel_config.yaml

@@ -329,7 +329,7 @@ openstack-marconi:
       - change-merged
       - x-vrif-minus-2
     projects:
-      - stackforge/marconi
+      - openstack/marconi
-      - stackforge/python-marconiclient
+      - openstack/python-marconiclient
     branches:
       - master

modules/launchpad_sync/files/update_gerrit_users.py

@@ -280,7 +280,7 @@ class Sync(object):
                 'stackforge/bufunfa',
                 'openstack/diskimage-builder',
                 'stackforge/libra',
-                'stackforge/marconi',
+                'openstack/marconi',
                 'stackforge/designate',
                 'stackforge/python-designateclient',
                 'openstack/python-troveclient',

modules/openstack_project/files/jenkins_job_builder/config/projects.yaml

@@ -744,16 +744,23 @@
     jobs:
       - python-jobs
 
-
 - project:
     name: marconi
-    github-org: stackforge
+    github-org: openstack
     tarball-site: tarballs.openstack.org
     node: precise
 
     jobs:
       - python-jobs
 
+- project:
+    name: python-marconiclient
+    github-org: openstack
+    tarball-site: tarballs.openstack.org
+    node: precise
+
+    jobs:
+      - python-jobs
 
 - project:
     name: designate
@@ -1082,15 +1089,6 @@
       - gate-{name}-puppet-syntax
       - puppet-module-unit
 
-- project:
-    name: python-marconiclient
-    github-org: stackforge
-    tarball-site: tarballs.openstack.org
-    node: precise
-
-    jobs:
-      - python-jobs
-
 - project:
     name: cookbook-openstack-common
     github-org: stackforge

modules/openstack_project/files/zuul/layout-dev.yaml

@@ -492,7 +492,7 @@ projects:
       - gate-python-troveclient-python26
       - gate-python-troveclient-python27
 
-  - name: stackforge/marconi
+  - name: openstack/marconi
     check:
       - gate-marconi-pep8
       - gate-marconi-python26
@@ -723,7 +723,7 @@ projects:
     check:
       - gate-noop
 
-  - name: stackforge/python-marconiclient
+  - name: openstack/python-marconiclient
     check:
       - gate-python-marconiclient-pep8
       - gate-python-marconiclient-python26

modules/openstack_project/files/zuul/layout.yaml

@@ -1803,7 +1803,7 @@ projects:
           - post-mirror-python27
           - post-mirror-python33
 
-  - name: stackforge/marconi
+  - name: openstack/marconi
     check:
       - gate-marconi-pep8
       - gate-marconi-python26
@@ -2707,7 +2707,7 @@ projects:
     gate:
       - gate-noop
 
-  - name: stackforge/python-marconiclient
+  - name: openstack/python-marconiclient
     check:
       - gate-python-marconiclient-pep8
       - gate-python-marconiclient-python26

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

@@ -147,7 +147,7 @@
   upstream: git://github.com/healthnmon/healthnmon.git
 - project: stackforge/libra
 - project: stackforge/python-libraclient
-- project: stackforge/marconi
+- project: openstack/marconi
 - project: stackforge/staccato
   description: VM Image Transfer Service
   upstream: git://github.com/buzztroll/staccato.git
@@ -265,7 +265,7 @@
 - project: stackforge/openvz-nova-driver
   description: OpenVz driver for Nova
   upstream: git://github.com/imsplitbit/openvz-nova-driver.git
-- project: stackforge/python-marconiclient
+- project: openstack/python-marconiclient
 - project: stackforge/openstack-chef-repo
   description: Example Chef Repo that sets up an OpenStack Deployment
   acl-config: /home/gerrit2/acls/stackforge/chef-cookbooks.config