From d9f0d31ef5f8387a8813f03a39958f17c8273752 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Tue, 4 Aug 2015 21:48:02 -0700
Subject: [PATCH] Move Kolla to the openstack git namespace

The TC approved Kolla for the openstack namespace in change:
If6e30574235e61ea6850e364d5ac7d11bc0ee2b4

This patch executes the rename.

Change-Id: I47c7acda7b0b71b774d4fcc49bfd4674652b177e
---
 .../{stackforge => openstack}/kolla.config    |  0
 gerrit/projects.yaml                          |  4 +-
 gerritbot/channels.yaml                       |  2 +-
 jenkins/jobs/projects.yaml                    | 54 +++++++++----------
 zuul/layout.yaml                              | 32 +++++------
 5 files changed, 46 insertions(+), 46 deletions(-)
 rename gerrit/acls/{stackforge => openstack}/kolla.config (100%)

diff --git a/gerrit/acls/stackforge/kolla.config b/gerrit/acls/openstack/kolla.config
similarity index 100%
rename from gerrit/acls/stackforge/kolla.config
rename to gerrit/acls/openstack/kolla.config
diff --git a/gerrit/projects.yaml b/gerrit/projects.yaml
index bdef57bbc7..c1c4c2f762 100755
--- a/gerrit/projects.yaml
+++ b/gerrit/projects.yaml
@@ -1102,6 +1102,8 @@
 - project: openstack/kloudbuster
   description: A tool to load OpenStack clouds end to end in both control plane and
     data plane.
+- project: openstack/kolla
+  description: Kolla provides production-ready containers and deployment tools for operating OpenStack clouds
 - project: openstack/kosmos
   description: Global Server Load-Balancing
 - project: openstack/kosmos-specs
@@ -2376,8 +2378,6 @@
 - project: stackforge/kickstack
   description: Rapid OpenStack deployment with puppet-dashboard, The Foreman, or any
     other Puppet ENC
-- project: stackforge/kolla
-  description: Kolla - Deploying OpenStack using Docker
 - project: stackforge/kwapi
   description: Energy Efficiency Monitoring
 - project: stackforge/libra
diff --git a/gerritbot/channels.yaml b/gerritbot/channels.yaml
index 6130df330f..4a78e484f4 100755
--- a/gerritbot/channels.yaml
+++ b/gerritbot/channels.yaml
@@ -174,7 +174,7 @@ kolla:
       - change-merged
       - x-vrif-minus-2
     projects:
-      - stackforge/kolla
+      - openstack/kolla
     branches:
       - master
       - stable/kilo
diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml
index bb99d21adb..cbffab987b 100755
--- a/jenkins/jobs/projects.yaml
+++ b/jenkins/jobs/projects.yaml
@@ -637,6 +637,33 @@
       - openstack-publish-jobs
       - python-jobs
 
+- project:
+    name: kolla
+    node: 'bare-precise || bare-trusty'
+    doc-publisher-site: docs.openstack.org
+
+    jobs:
+      - gate-{name}-bashate
+      - gate-{name}-pep8
+      - openstack-publish-jobs
+      - 'gate-{name}-tox-{envlist}':
+          envlist: validate-contents
+      - '{pipeline}-kolla-build-images-{distro}-{type}':
+          distro: centos
+          node: 'devstack-centos7'
+          pipeline: gate
+          type: binary
+      - '{pipeline}-kolla-build-images-{distro}-{type}':
+          distro: centos
+          node: 'devstack-centos7'
+          pipeline: gate
+          type: source
+      - '{pipeline}-kolla-build-images-{distro}-{type}':
+          distro: ubuntu
+          node: 'devstack-trusty'
+          pipeline: gate
+          type: source
+
 - project:
     name: kosmos
     node: 'bare-precise || bare-trusty'
@@ -5394,33 +5421,6 @@
       - pypi-jobs
       - hook-{name}-rtfd
 
-- project:
-    name: kolla
-    node: 'bare-precise || bare-trusty'
-    doc-publisher-site: docs.openstack.org
-
-    jobs:
-      - gate-{name}-bashate
-      - gate-{name}-pep8
-      - openstack-publish-jobs
-      - 'gate-{name}-tox-{envlist}':
-          envlist: validate-contents
-      - '{pipeline}-kolla-build-images-{distro}-{type}':
-          distro: centos
-          node: 'devstack-centos7'
-          pipeline: gate
-          type: binary
-      - '{pipeline}-kolla-build-images-{distro}-{type}':
-          distro: centos
-          node: 'devstack-centos7'
-          pipeline: gate
-          type: source
-      - '{pipeline}-kolla-build-images-{distro}-{type}':
-          distro: ubuntu
-          node: 'devstack-trusty'
-          pipeline: gate
-          type: source
-
 - project:
     name: kwapi
     node: 'bare-precise || bare-trusty'
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index e2704bbb9e..74067a16ce 100755
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -2368,6 +2368,22 @@ projects:
       - name: docs-on-rtfd
       - name: publish-to-pypi
 
+  - name: openstack/kolla
+    template:
+      - name: merge-check
+      - name: openstack-server-publish-jobs
+    check:
+      - gate-kolla-bashate
+      - gate-kolla-pep8
+      - gate-kolla-tox-validate-contents
+      - gate-kolla-build-images-centos-binary
+      - gate-kolla-build-images-centos-source
+      - gate-kolla-build-images-ubuntu-source
+    gate:
+      - gate-kolla-bashate
+      - gate-kolla-pep8
+      - gate-kolla-tox-validate-contents
+
   - name: openstack/kosmos
     template:
       - name: merge-check
@@ -7701,22 +7717,6 @@ projects:
       - name: merge-check
       - name: noop-jobs
 
-  - name: stackforge/kolla
-    template:
-      - name: merge-check
-      - name: openstack-server-publish-jobs
-    check:
-      - gate-kolla-bashate
-      - gate-kolla-pep8
-      - gate-kolla-tox-validate-contents
-      - gate-kolla-build-images-centos-binary
-      - gate-kolla-build-images-centos-source
-      - gate-kolla-build-images-ubuntu-source
-    gate:
-      - gate-kolla-bashate
-      - gate-kolla-pep8
-      - gate-kolla-tox-validate-contents
-
   - name: stackforge/kwapi
     template:
       - name: merge-check