Move barbican from stackforge to barbican

Change-Id: Ia7994016f83b2abddc00484b827d2921174b4544

modules/gerritbot/files/gerritbot_channel_config.yaml

@@ -380,9 +380,9 @@ openstack-barbican:
       - change-merged
       - x-vrif-minus-2
     projects:
-      - stackforge/barbican
+      - openstack/barbican
+      - openstack/python-barbicanclient
       - stackforge/kite
-      - stackforge/python-barbicanclient
       - stackforge/python-kiteclient
     branches:
       - master

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

@@ -17,8 +17,8 @@
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TIMEOUT=60
           export ENABLED_SERVICES=barbican,tempest,keystone
-          export PROJECTS="stackforge/barbican $PROJECTS"
-          export PROJECTS="stackforge/python-barbicanclient $PROJECTS"
+          export PROJECTS="openstack/barbican $PROJECTS"
+          export PROJECTS="openstack/python-barbicanclient $PROJECTS"
 
           function pre_test_hook {
               cd /opt/stack/new/barbican/functionaltests

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

@@ -2000,7 +2000,7 @@
 
 - project:
     name: barbican
-    github-org: stackforge
+    github-org: openstack
     node: bare-precise
     tarball-site: tarballs.openstack.org
 
@@ -2009,7 +2009,7 @@
 
 - project:
     name: python-barbicanclient
-    github-org: stackforge
+    github-org: openstack
     node: bare-precise
     tarball-site: tarballs.openstack.org
 

modules/openstack_project/files/review.projects.yaml

@@ -206,6 +206,9 @@
   group: openstack-api-site
   options:
     - direct-release
+- project: openstack/barbican
+  description: Barbican is a ReST API designed for the secure storage, provisioning and management of secrets, including in OpenStack environments.
+  upstream: git://github.com/cloudkeep/barbican.git
 - project: openstack/baremetal-specs
   group: ironic
 - project: openstack/ceilometer
@@ -349,6 +352,9 @@
   upstream: git://github.com/dhellmann/oslo.test.git
 - project: openstack/pycadf
   description: CADF Python module
+- project: openstack/python-barbicanclient
+  description: Client library for Barbican API.
+  upstream: git://github.com/cloudkeep/python-barbicanclient
 - project: openstack/python-ceilometerclient
   upstream: git://github.com/asalkeld/python-ceilometerclient.git
 - project: openstack/python-cinderclient
@@ -450,9 +456,6 @@
 - project: stackforge/aviator
   description: An OpenStack client library for Ruby
   upstream: git://github.com/aviator/aviator
-- project: stackforge/barbican
-  description: Barbican is a ReST API designed for the secure storage, provisioning and management of secrets, including in OpenStack environments.
-  upstream: git://github.com/cloudkeep/barbican.git
 - project: stackforge/billingstack
   upstream: git://github.com/billingstack/billingstack
   description: Billing software
@@ -872,9 +875,6 @@
 - project: stackforge/pyghmi
   description: A Pure python IPMI library
   upstream: git://git.code.sf.net/p/xcat/python-ipmi
-- project: stackforge/python-barbicanclient
-  description: Client library for Barbican API.
-  upstream: git://github.com/cloudkeep/python-barbicanclient
 - project: stackforge/python-climateclient
   description: Client for OpenStack Climate
   acl-config: /home/gerrit2/acls/stackforge/climate.config

modules/openstack_project/files/zuul/layout.yaml

@@ -615,6 +615,20 @@ projects:
 
 # Section: OpenStack server projects
 
+  - name: openstack/barbican
+    check:
+      - gate-barbican-pep8
+      - gate-barbican-python27
+      - gate-barbican-python26
+      - gate-barbican-devstack-dsvm
+    gate:
+      - gate-barbican-pep8
+      - gate-barbican-python27
+      - gate-barbican-python26
+      - gate-barbican-devstack-dsvm
+    post:
+      - barbican-branch-tarball
+
   - name: openstack/ceilometer
     template:
       - name: python-jobs
@@ -1185,6 +1199,24 @@ projects:
 
 # Section: OpenStack client projects
 
+  - name: openstack/python-barbicanclient
+    check:
+      - gate-python-barbicanclient-pep8
+      - gate-python-barbicanclient-python26
+      - gate-python-barbicanclient-python27
+    gate:
+      - gate-python-barbicanclient-pep8
+      - gate-python-barbicanclient-python26
+      - gate-python-barbicanclient-python27
+    post:
+      - python-barbicanclient-branch-tarball
+    release:
+      - python-barbicanclient-tarball:
+        - python-barbicanclient-pypi-upload:
+          - post-mirror-python26
+          - post-mirror-python27
+          - post-mirror-python33
+
   - name: openstack/python-ceilometerclient
     template:
       - name: python-jobs
@@ -3314,20 +3346,6 @@ projects:
     gate:
       - noop
 
-  - name: stackforge/barbican
-    check:
-      - gate-barbican-pep8
-      - gate-barbican-python27
-      - gate-barbican-python26
-      - gate-barbican-devstack-dsvm
-    gate:
-      - gate-barbican-pep8
-      - gate-barbican-python27
-      - gate-barbican-python26
-      - gate-barbican-devstack-dsvm
-    post:
-      - barbican-branch-tarball
-
   - name: stackforge/billingstack
     check:
       - gate-billingstack-pep8
@@ -4460,24 +4478,6 @@ projects:
           - post-mirror-python27
           - post-mirror-python33
 
-  - name: stackforge/python-barbicanclient
-    check:
-      - gate-python-barbicanclient-pep8
-      - gate-python-barbicanclient-python26
-      - gate-python-barbicanclient-python27
-    gate:
-      - gate-python-barbicanclient-pep8
-      - gate-python-barbicanclient-python26
-      - gate-python-barbicanclient-python27
-    post:
-      - python-barbicanclient-branch-tarball
-    release:
-      - python-barbicanclient-tarball:
-        - python-barbicanclient-pypi-upload:
-          - post-mirror-python26
-          - post-mirror-python27
-          - post-mirror-python33
-
   - name: stackforge/python-climateclient
     template:
       - name: check-requirements