Rename and delete a set of projects

s,stackforge/diskimage-builder,openstack/diskimage-builder,
s,stackforge/os-collect-config,openstack/os-collect-config,
s,stackforge/os-apply-config,openstack/os-apply-config,
s,stackforge/os-refresh-config,openstack/os-refresh-config,
s,stackforge/tripleo-image-elements,openstack/tripleo-image-elements,
s,stackforge/tripleo-heat-templates,openstack/tripleo-heat-templates,
s,stackforge/python-ipmi,stackforge/pyhgmi,
s,stackforge/puppet-quantum,stackforge/puppet-neutron,
d,openstack-infra/pypi-mirror,

Change-Id: I70096abcf35ab17650a1c12a42bf47bc58477381

modules/gerritbot/files/gerritbot_channel_config.yaml

@@ -101,13 +101,13 @@ tripleo:
       - change-merged
       - x-vrif-minus-2
     projects:
-      - stackforge/diskimage-builder
-      - stackforge/os-collect-config
-      - stackforge/os-apply-config
-      - stackforge/os-refresh-config
-      - stackforge/tripleo-image-elements
+      - openstack/diskimage-builder
+      - openstack/os-collect-config
+      - openstack/os-apply-config
+      - openstack/os-refresh-config
+      - openstack/tripleo-image-elements
       - openstack/tripleo-incubator
-      - stackforge/tripleo-heat-templates
+      - openstack/tripleo-heat-templates
       - openstack-infra/tripleo-ci
     branches:
       - master
@@ -186,10 +186,10 @@ puppet-openstack:
       - stackforge/puppet-heat
       - stackforge/puppet-horizon
       - stackforge/puppet-keystone
+      - stackforge/puppet-neutron
       - stackforge/puppet-nova
       - stackforge/puppet-openstack
       - stackforge/puppet-openstack_dev_env
-      - stackforge/puppet-quantum
       - stackforge/puppet-swift
       - stackforge/puppet-tempest
     branches:
@@ -250,7 +250,7 @@ openstack-ironic:
     projects:
       - openstack/ironic
       - openstack/python-ironicclient
-      - stackforge/python-ipmi
+      - stackforge/pyghmi
     branches:
       - master
 

modules/launchpad_sync/files/update_gerrit_users.py

@@ -235,7 +235,6 @@ class Sync(object):
                 'openstack-infra/puppet-apparmor',
                 'openstack-infra/puppet-dashboard',
                 'openstack-infra/puppet-vcsrepo',
-                'openstack-infra/pypi-mirror',
                 'openstack-infra/zuul',
                 'openstack-dev/devstack',
                 'openstack-dev/openstack-nose',
@@ -279,7 +278,7 @@ class Sync(object):
                 'openstack/volume-api',
                 'stackforge/MRaaS',
                 'stackforge/bufunfa',
-                'stackforge/diskimage-builder',
+                'openstack/diskimage-builder',
                 'stackforge/libra',
                 'stackforge/marconi',
                 'stackforge/designate',

modules/openstack_project/files/gerrit/acls/openstack-infra/pypi-mirror.config

@@ -1,9 +0,0 @@
-[access "refs/heads/*"]
-        label-Code-Review = -2..+2 group openstack-ci-core
-        label-Approved = +0..+1 group openstack-ci-core
-[project]
-        state = active
-[receive]
-        requireChangeId = true
-[submit]
-        mergeContent = true

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

@@ -925,7 +925,7 @@
       - devstack-node-provider-jobs
 
 - project:
-    name: python-ipmi
+    name: pyghmi
     github-org: stackforge
     node: precise
     tarball-site: tarballs.openstack.org
@@ -935,7 +935,7 @@
 
 - project:
     name: diskimage-builder
-    github-org: stackforge
+    github-org: openstack
     node: precise
     tarball-site: tarballs.openstack.org
 
@@ -945,7 +945,7 @@
 
 - project:
     name: os-apply-config
-    github-org: stackforge
+    github-org: openstack
     node: precise
     tarball-site: tarballs.openstack.org
 
@@ -955,7 +955,7 @@
 
 - project:
     name: os-collect-config
-    github-org: stackforge
+    github-org: openstack
     node: precise
     tarball-site: tarballs.openstack.org
 
@@ -965,7 +965,7 @@
 
 - project:
     name: os-refresh-config
-    github-org: stackforge
+    github-org: openstack
     node: precise
     tarball-site: tarballs.openstack.org
 
@@ -975,7 +975,7 @@
 
 - project:
     name: tripleo-image-elements
-    github-org: stackforge
+    github-org: openstack
     node: precise
     tarball-site: tarballs.openstack.org
 
@@ -1094,7 +1094,7 @@
       - puppet-module-unit
 
 - project:
-    name: puppet-quantum
+    name: puppet-neutron
     github-org: stackforge
     node: precise
     tarball-site: tarballs.openstack.org

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

@@ -580,25 +580,25 @@ projects:
     check:
       - gate-noop
 
-  - name: stackforge/diskimage-builder
+  - name: openstack/diskimage-builder
     check:
       - gate-diskimage-builder-pep8
       - gate-diskimage-builder-python26
       - gate-diskimage-builder-python27
 
-  - name: stackforge/os-apply-config
+  - name: openstack/os-apply-config
     check:
       - gate-os-apply-config-pep8
       - gate-os-apply-config-python26
       - gate-os-apply-config-python27
 
-  - name: stackforge/os-refresh-config
+  - name: openstack/os-refresh-config
     check:
       - gate-os-refresh-config-pep8
       - gate-os-refresh-config-python26
       - gate-os-refresh-config-python27
 
-  - name: stackforge/tripleo-image-elements
+  - name: openstack/tripleo-image-elements
     check:
       - gate-tripleo-image-elements-pep8
       - gate-tripleo-image-elements-python26
@@ -685,11 +685,11 @@ projects:
       - gate-puppet-nova-puppet-unit-3.0
       - gate-puppet-nova-puppet-unit-3.1
 
-  - name: stackforge/puppet-quantum
+  - name: stackforge/puppet-neutron
     check:
-      - gate-puppet-quantum-puppet-unit-2.7
-      - gate-puppet-quantum-puppet-unit-3.0
-      - gate-puppet-quantum-puppet-unit-3.1
+      - gate-puppet-neutron-puppet-unit-2.7
+      - gate-puppet-neutron-puppet-unit-3.0
+      - gate-puppet-neutron-puppet-unit-3.1
 
   - name: stackforge/puppet-openstack
     check:

modules/openstack_project/files/zuul/layout.yaml

@@ -1938,7 +1938,7 @@ projects:
     gate:
       - gate-noop
 
-  - name: stackforge/diskimage-builder
+  - name: openstack/diskimage-builder
     check:
       - gate-diskimage-builder-pep8
       - gate-diskimage-builder-python26
@@ -1956,7 +1956,7 @@ projects:
       - diskimage-builder-tarball:
         - diskimage-builder-pypi-upload
 
-  - name: stackforge/os-apply-config
+  - name: openstack/os-apply-config
     check:
       - gate-os-apply-config-pep8
       - gate-os-apply-config-python26
@@ -1974,7 +1974,7 @@ projects:
       - os-apply-config-tarball:
         - os-apply-config-pypi-upload
 
-  - name: stackforge/os-collect-config
+  - name: openstack/os-collect-config
     check:
       - gate-os-collect-config-pep8
       - gate-os-collect-config-python26
@@ -1992,7 +1992,7 @@ projects:
       - os-collect-config-tarball:
         - os-collect-config-pypi-upload
 
-  - name: stackforge/os-refresh-config
+  - name: openstack/os-refresh-config
     check:
       - gate-os-refresh-config-pep8
       - gate-os-refresh-config-python26
@@ -2010,13 +2010,13 @@ projects:
       - os-refresh-config-tarball:
         - os-refresh-config-pypi-upload
 
-  - name: stackforge/tripleo-heat-templates
+  - name: openstack/tripleo-heat-templates
     check:
       - gate-noop
     gate:
       - gate-noop
 
-  - name: stackforge/tripleo-image-elements
+  - name: openstack/tripleo-image-elements
     check:
       - gate-noop
     gate:
@@ -2326,19 +2326,19 @@ projects:
       - gate-puppet-nova-puppet-unit-3.0
       - gate-puppet-nova-puppet-unit-3.1
 
-  - name: stackforge/puppet-quantum
+  - name: stackforge/puppet-neutron
     check:
-      - gate-puppet-quantum-puppet-lint
-      - gate-puppet-quantum-puppet-syntax
-      - gate-puppet-quantum-puppet-unit-2.7
-      - gate-puppet-quantum-puppet-unit-3.0
-      - gate-puppet-quantum-puppet-unit-3.1
+      - gate-puppet-neutron-puppet-lint
+      - gate-puppet-neutron-puppet-syntax
+      - gate-puppet-neutron-puppet-unit-2.7
+      - gate-puppet-neutron-puppet-unit-3.0
+      - gate-puppet-neutron-puppet-unit-3.1
     gate:
-      - gate-puppet-quantum-puppet-lint
-      - gate-puppet-quantum-puppet-syntax
-      - gate-puppet-quantum-puppet-unit-2.7
-      - gate-puppet-quantum-puppet-unit-3.0
-      - gate-puppet-quantum-puppet-unit-3.1
+      - gate-puppet-neutron-puppet-lint
+      - gate-puppet-neutron-puppet-syntax
+      - gate-puppet-neutron-puppet-unit-2.7
+      - gate-puppet-neutron-puppet-unit-3.0
+      - gate-puppet-neutron-puppet-unit-3.1
 
   - name: stackforge/puppet-openstack
     check:
@@ -2745,11 +2745,11 @@ projects:
     release:
       - stackalytics-tarball
 
-  - name: stackforge/python-ipmi
+  - name: stackforge/pyghmi
     check:
-      - gate-python-ipmi-pep8
+      - gate-pyghmi-pep8
     gate:
-      - gate-python-ipmi-pep8
+      - gate-pyghmi-pep8
 
   - name: openstack-infra/tripleo-ci
     check:

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

@@ -132,17 +132,14 @@
 - project: stackforge/bindep
   description: "Binary dependency automation"
   upstream: git://github.com/rbtcollins/bindep.git
-- project: stackforge/diskimage-builder
+- project: openstack/diskimage-builder
   description: "Image building tools for OpenStack"
-- project: stackforge/tripleo-heat-templates
+- project: openstack/tripleo-heat-templates
   description: "Heat templates for deploying OpenStack"
-  upstream: git://github.com/openstack-ops/templates.git
-- project: stackforge/tripleo-image-elements
+- project: openstack/tripleo-image-elements
   description: "Disk image elements for deployment images of Openstack"
-  upstream: git://github.com/stackforge/diskimage-builder.git
 - project: openstack/tripleo-incubator
   description: "The TripleO incubator where unformed things are experimented with."
-  upstream: git://github.com/tripleo/incubator.git
 - project: stackforge/healthnmon
   description: "Healthnmon aims to deliver 'Cloud Resource Monitor', an extensible service to OpenStack Cloud Operating system by providing monitoring service for Cloud Resources and Infrastructure with a pluggable framework for 'Inventory Management', 'Alerts and notifications' and 'Utilization Data."
   upstream: git://github.com/healthnmon/healthnmon.git
@@ -191,13 +188,11 @@
 - project: stackforge/savanna-extra
   description: "Repo for Savanna-related utils."
   acl-config: /home/gerrit2/acls/stackforge/savanna.config
-- project: stackforge/os-apply-config
-  description: "Apply configuration from cloud metadata"
-- project: stackforge/os-collect-config
+- project: openstack/os-apply-config
+  description: "Apply configuration from cloud metadata."
+- project: openstack/os-collect-config
   description: "Collect and cache metadata, run hooks on changes."
-  upstream: git://github.com/SpamapS/os-collect-config.git
-- project: stackforge/os-refresh-config
-  upstream: git://github.com/tripleo/os-refresh-config.git
+- project: openstack/os-refresh-config
   description: "Restart services and coordinate data migration on Heat config changes."
 - project: stackforge/puppet-ceilometer
   description: OpenStack Ceilometer Puppet Module
@@ -243,7 +238,7 @@
   description: OpenStack Tempest Puppet Module
   acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config
   upstream: git://github.com/puppetlabs/puppetlabs-tempest.git
-- project: stackforge/puppet-quantum
+- project: stackforge/puppet-neutron
   description: OpenStack Quantum Puppet Module
   acl-config: /home/gerrit2/acls/stackforge/puppet-modules.config
   upstream: git://github.com/bodepd/puppet-quantum.git