Merge "Move savanna under openstack org"

modules/gerritbot/files/gerritbot_channel_config.yaml

@@ -145,13 +145,17 @@ savanna:
       - change-merged
       - x-vrif-minus-2
     projects:
-      - stackforge/savanna
-      - stackforge/python-savannaclient
-      - stackforge/savanna-dashboard
-      - stackforge/savanna-extra
+      - openstack/savanna
+      - openstack/python-savannaclient
+      - openstack/savanna-dashboard
+      - openstack/savanna-extra
+      - openstack/savanna-image-elements
+      - stackforge/puppet-savanna
     branches:
       - master
       - stable/0.1
+      - stable/0.2
+      - stable/0.3
 
 openstack-nova:
     events:

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

@@ -72,10 +72,11 @@
 
 - project:
     name: savanna
-    github-org: stackforge
+    github-org: openstack
     node: precise
     rtfd-id: 7095
     tarball-site: tarballs.openstack.org
+    doc-publisher-site: docs.openstack.org
 
     jobs:
       - python-jobs
@@ -83,10 +84,11 @@
       - hook-{name}-rtfd
       - pypi-jobs
       - translation-jobs
+      - openstack-publish-jobs
 
 - project:
     name: python-savannaclient
-    github-org: stackforge
+    github-org: openstack
     node: precise
     rtfd-id: 7106
     tarball-site: tarballs.openstack.org
@@ -98,7 +100,7 @@
 
 - project:
     name: savanna-dashboard
-    github-org: stackforge
+    github-org: openstack
     node: precise
     rtfd-id: 7335
     tarball-site: tarballs.openstack.org

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

@@ -643,13 +643,13 @@ projects:
     check:
       - gate-noop
 
-  - name: stackforge/savanna
+  - name: openstack/savanna
     check:
       - gate-savanna-pep8
       - gate-savanna-python26
       - gate-savanna-python27
 
-  - name: stackforge/python-savannaclient
+  - name: openstack/python-savannaclient
     check:
       - gate-python-savannaclient-pep8
       - gate-python-savannaclient-python26

modules/openstack_project/files/zuul/layout.yaml

@@ -2383,7 +2383,7 @@ projects:
       - gate-anvil-pep8
       - gate-anvil-pylint
 
-  - name: stackforge/savanna
+  - name: openstack/savanna
     check:
       - gate-savanna-docs
       - gate-savanna-pep8
@@ -2412,10 +2412,11 @@ projects:
           - post-mirror-python27
           - post-mirror-python33
       - hook-savanna-rtfd
+      - savanna-docs
     periodic:
       - savanna-propose-translation-update
 
-  - name: stackforge/python-savannaclient
+  - name: openstack/python-savannaclient
     check:
       - gate-python-savannaclient-pep8
       - gate-python-savannaclient-python26
@@ -2441,7 +2442,7 @@ projects:
            - post-mirror-python33
        - hook-python-savannaclient-rtfd
 
-  - name: stackforge/savanna-dashboard
+  - name: openstack/savanna-dashboard
     check:
       - gate-savanna-dashboard-pep8
       - gate-savanna-dashboard-python26
@@ -2467,13 +2468,13 @@ projects:
           - post-mirror-python33
       - hook-savanna-dashboard-rtfd
 
-  - name: stackforge/savanna-extra
+  - name: openstack/savanna-extra
     check:
       - gate-noop
     gate:
       - gate-noop
 
-  - name: stackforge/savanna-image-elements
+  - name: openstack/savanna-image-elements
     check:
       - gate-noop
     gate:

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

@@ -181,26 +181,24 @@
 - project: stackforge/anvil
   description: "A set of python scripts and utilities to forge raw openstack into a productive tool!"
   upstream: git://github.com/yahoo/Openstack-Anvil.git
-- project: stackforge/savanna
+- project: openstack/savanna
   description: "Savanna aims to provide users with simple means to provision a Hadoop cluster by specifying several parameters like Hadoop version, cluster topology, nodes hardware details and a few more."
-  upstream: git://github.com/Mirantis/savanna.git
-  acl-config: /home/gerrit2/acls/stackforge/savanna.config
-- project: stackforge/python-savannaclient
+  acl-config: /home/gerrit2/acls/openstack/savanna.config
+- project: openstack/python-savannaclient
   description: "Python bindings and CLI to Savanna."
-  acl-config: /home/gerrit2/acls/stackforge/savanna.config
-- project: stackforge/savanna-dashboard
+  acl-config: /home/gerrit2/acls/openstack/savanna.config
+- project: openstack/savanna-dashboard
   description: "Savanna Horizon plugin."
-  acl-config: /home/gerrit2/acls/stackforge/savanna.config
-- project: stackforge/savanna-extra
+  acl-config: /home/gerrit2/acls/openstack/savanna.config
+- project: openstack/savanna-extra
   description: "Repo for Savanna-related utils."
-  acl-config: /home/gerrit2/acls/stackforge/savanna.config
-- project: stackforge/savanna-image-elements
+  acl-config: /home/gerrit2/acls/openstack/savanna.config
+- project: openstack/savanna-image-elements
   description: "Disk image elements for Savanna"
-  upstream: git://github.com/savanna-project/savanna-image-elements.git
-  acl-config: /home/gerrit2/acls/stackforge/savanna.config
+  acl-config: /home/gerrit2/acls/openstack/savanna.config
 - project: stackforge/puppet-savanna
   description: "Savanna Puppet Module"
-  acl-config: /home/gerrit2/acls/stackforge/savanna.config
+  acl-config: /home/gerrit2/acls/openstack/savanna.config
 - project: openstack/os-apply-config
   description: "Apply configuration from cloud metadata."
 - project: openstack/os-collect-config