From 590c312ae010639bd654b4729ce49609eacf3f71 Mon Sep 17 00:00:00 2001
From: "Jay Lau (Guangya Liu)" <liugya@cn.ibm.com>
Date: Sat, 28 Mar 2015 20:05:02 +0800
Subject: [PATCH] Update magnum document to use openstack as namespace

Magnum is now moved to openstack namespace, all of the document
should also be updated to reflect this.

Change-Id: I8c91e99098acdfd2253b2ecd7100fc54aae370af
---
 README.rst                                          | 6 +++---
 contrib/devstack/README.rst                         | 2 +-
 contrib/devstack/lib/magnum                         | 4 ++--
 doc/source/dev/dev-manual-devstack.rst              | 4 ++--
 doc/source/dev/dev-quickstart.rst                   | 4 ++--
 magnum/templates/heat-kubernetes/elements/README.md | 2 +-
 6 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/README.rst b/README.rst
index 7722b56023..7b9f3dc579 100644
--- a/README.rst
+++ b/README.rst
@@ -6,9 +6,9 @@ new Openstack project for containers.
 
 * Free software: Apache license
 * Documentation: http://docs.openstack.org/developer/magnum
-* Source: http://git.openstack.org/cgit/stackforge/magnum
+* Source: http://git.openstack.org/cgit/openstack/magnum
 * Bugs: http://bugs.launchpad.net/magnum
-* ReST Client: http://git.openstack.org/cgit/stackforge/python-magnumclient
+* ReST Client: http://git.openstack.org/cgit/openstack/python-magnumclient
 
 Architecture
 ------------
@@ -48,4 +48,4 @@ Features
 
 Installation and Usage
 ----------------------
-* Getting Started Guides: http://git.openstack.org/cgit/stackforge/magnum/tree/doc/source/dev/dev-quickstart.rst
+* Getting Started Guides: http://git.openstack.org/cgit/openstack/magnum/tree/doc/source/dev/dev-quickstart.rst
diff --git a/contrib/devstack/README.rst b/contrib/devstack/README.rst
index 08aceb5571..3d9a60c6c9 100644
--- a/contrib/devstack/README.rst
+++ b/contrib/devstack/README.rst
@@ -13,7 +13,7 @@ this time.
 
 To install magnum into devstack: ::
 
-    git clone https://git.openstack.org/stackforge/magnum /opt/stack/magnum
+    git clone https://git.openstack.org/openstack/magnum /opt/stack/magnum
     git clone https://git.openstack.org/openstack-dev/devstack /opt/stack/devstack
 
     # copy example localrc, modify as necessary
diff --git a/contrib/devstack/lib/magnum b/contrib/devstack/lib/magnum
index 8b911b1af8..6c9ca3662c 100644
--- a/contrib/devstack/lib/magnum
+++ b/contrib/devstack/lib/magnum
@@ -28,11 +28,11 @@ set +o xtrace
 # --------
 
 # Set up default directories
-MAGNUM_REPO=${MAGNUM_REPO:-${GIT_BASE}/stackforge/magnum.git}
+MAGNUM_REPO=${MAGNUM_REPO:-${GIT_BASE}/openstack/magnum.git}
 MAGNUM_BRANCH=${MAGNUM_BRANCH:-master}
 MAGNUM_DIR=$DEST/magnum
 
-GITREPO["python-magnumclient"]=${MAGNUMCLIENT_REPO:-${GIT_BASE}/stackforge/python-magnumclient.git}
+GITREPO["python-magnumclient"]=${MAGNUMCLIENT_REPO:-${GIT_BASE}/openstack/python-magnumclient.git}
 GITBRANCH["python-magnumclient"]=${MAGNUMCLIENT_BRANCH:-master}
 GITDIR["python-magnumclient"]=$DEST/python-magnumclient
 
diff --git a/doc/source/dev/dev-manual-devstack.rst b/doc/source/dev/dev-manual-devstack.rst
index c9ce7344ee..a38675d29f 100644
--- a/doc/source/dev/dev-manual-devstack.rst
+++ b/doc/source/dev/dev-manual-devstack.rst
@@ -112,7 +112,7 @@ Next, create a database in MySQL for Magnum::
 Next, clone and install Magnum::
 
     cd ~
-    git clone https://github.com/stackforge/magnum
+    git clone https://github.com/openstack/magnum
     cd magnum
     sudo pip install -e .
 
@@ -154,7 +154,7 @@ Next configure Magnum::
 Next, clone and install the client::
 
     cd ~
-    git clone https://github.com/stackforge/python-magnumclient
+    git clone https://github.com/openstack/python-magnumclient
     cd python-magnumclient
     sudo pip install -e .
 
diff --git a/doc/source/dev/dev-quickstart.rst b/doc/source/dev/dev-quickstart.rst
index 457bde3703..633b522b96 100644
--- a/doc/source/dev/dev-quickstart.rst
+++ b/doc/source/dev/dev-quickstart.rst
@@ -53,7 +53,7 @@ Magnum source code should be pulled directly from git::
 
     # from your home or source directory
     cd ~
-    git clone https://git.openstack.org/stackforge/magnum
+    git clone https://git.openstack.org/openstack/magnum
     cd magnum
 
 Set up a local environment for development and testing should be done with tox::
@@ -120,7 +120,7 @@ Clone DevStack::
     sudo chown $USER /opt/stack
 
     git clone https://github.com/openstack-dev/devstack.git /opt/stack/devstack
-    git clone https://github.com/stackforge/magnum /opt/stack/magnum
+    git clone https://github.com/openstack/magnum /opt/stack/magnum
 
 Copy devstack/localrc with minimal settings required to enable Heat
 and Neutron, refer to http://docs.openstack.org/developer/devstack/guides/neutron.html
diff --git a/magnum/templates/heat-kubernetes/elements/README.md b/magnum/templates/heat-kubernetes/elements/README.md
index f6342deb6b..3e47ecbebb 100644
--- a/magnum/templates/heat-kubernetes/elements/README.md
+++ b/magnum/templates/heat-kubernetes/elements/README.md
@@ -6,7 +6,7 @@ elements to build an image which contains kubernetes required to use kubecluster
 
 An example fedora based image and uploaded to glance with the following:
 
-    git clone https://git.openstack.org/stackforge/magnum
+    git clone https://git.openstack.org/openstack/magnum
     git clone https://git.openstack.org/openstack/diskimage-builder.git
     git clone https://git.openstack.org/openstack/tripleo-image-elements.git
     git clone https://git.openstack.org/openstack/heat-templates.git