Merge "Update kollaglue repo on docker to kolla"

4 files changed, 10 insertions, 10 deletions

diff --git a/doc/heat-dev-env.rst b/doc/heat-dev-env.rst
index c711b8c60..4b320b88a 100644
--- a/doc/heat-dev-env.rst
+++ b/doc/heat-dev-env.rst
@@ -163,7 +163,7 @@ A few commands for debugging the system.
 
     $ sudo ./docker images
 
-Lists all images that have been pulled from the upstream kollaglue
+Lists all images that have been pulled from the upstream kolla
 repository thus far. This can be run on the node during the ``./start``
 operation to check on the download progress.
 
diff --git a/doc/image-building.rst b/doc/image-building.rst
index eb70d8aaa..cdafffdfa 100644
--- a/doc/image-building.rst
+++ b/doc/image-building.rst
@@ -65,7 +65,7 @@ Multiple names may be specified on the command line::
 
     kolla-build keystone nova
 
-``kolla-build`` uses ``kollaglue`` as default Docker namespace. This is
+``kolla-build`` uses ``kolla`` as default Docker namespace. This is
 controlled with the ``-n`` command line option. To push images to a dockerhub
 repository named ``mykollarepo``::
 
diff --git a/doc/quickstart.rst b/doc/quickstart.rst
index 819edecf4..135890f69 100644
--- a/doc/quickstart.rst
+++ b/doc/quickstart.rst
@@ -621,5 +621,5 @@ prompted to create an index. Please create an index using the name ``log-*``.
 This step is necessary until the default Kibana dashboard is implemented in
 Kolla.
 
-.. _Docker Hub Image Registry: https://hub.docker.com/u/kollaglue/
+.. _Docker Hub Image Registry: https://hub.docker.com/u/kolla/
 .. _launchpad bug: https://bugs.launchpad.net/kolla/+filebug
diff --git a/doc/swift-guide.rst b/doc/swift-guide.rst
index c241d2f3f..5e61d16b1 100644
--- a/doc/swift-guide.rst
+++ b/doc/swift-guide.rst
@@ -80,46 +80,46 @@ Please modify accordingly if your setup is different.
   # Object ring
   docker run \
     -v /etc/kolla/config/swift/:/etc/kolla/config/swift/ \
-    kollaglue/${KOLLA_BASE_DISTRO}-${KOLLA_INSTALL_TYPE}-swift-base \
+    kolla/${KOLLA_BASE_DISTRO}-${KOLLA_INSTALL_TYPE}-swift-base \
     swift-ring-builder /etc/kolla/config/swift/object.builder create 10 3 1
 
   for i in {0..2}; do
     docker run \
       -v /etc/kolla/config/swift/:/etc/kolla/config/swift/ \
-      kollaglue/${KOLLA_BASE_DISTRO}-${KOLLA_INSTALL_TYPE}-swift-base swift-ring-builder \
+      kolla/${KOLLA_BASE_DISTRO}-${KOLLA_INSTALL_TYPE}-swift-base swift-ring-builder \
       /etc/kolla/config/swift/object.builder add r1z1-${KOLLA_INTERNAL_ADDRESS}:6000/d${i} 1;
   done
 
   # Account ring
   docker run \
     -v /etc/kolla/config/swift/:/etc/kolla/config/swift/ \
-    kollaglue/${KOLLA_BASE_DISTRO}-${KOLLA_INSTALL_TYPE}-swift-base \
+    kolla/${KOLLA_BASE_DISTRO}-${KOLLA_INSTALL_TYPE}-swift-base \
     swift-ring-builder /etc/kolla/config/swift/account.builder create 10 3 1
 
   for i in {0..2}; do
     docker run \
       -v /etc/kolla/config/swift/:/etc/kolla/config/swift/ \
-      kollaglue/${KOLLA_BASE_DISTRO}-${KOLLA_INSTALL_TYPE}-swift-base swift-ring-builder \
+      kolla/${KOLLA_BASE_DISTRO}-${KOLLA_INSTALL_TYPE}-swift-base swift-ring-builder \
       /etc/kolla/config/swift/account.builder add r1z1-${KOLLA_INTERNAL_ADDRESS}:6001/d${i} 1;
   done
 
   # Container ring
   docker run \
     -v /etc/kolla/config/swift/:/etc/kolla/config/swift/ \
-    kollaglue/${KOLLA_BASE_DISTRO}-${KOLLA_INSTALL_TYPE}-swift-base \
+    kolla/${KOLLA_BASE_DISTRO}-${KOLLA_INSTALL_TYPE}-swift-base \
     swift-ring-builder /etc/kolla/config/swift/container.builder create 10 3 1
 
   for i in {0..2}; do
     docker run \
       -v /etc/kolla/config/swift/:/etc/kolla/config/swift/ \
-      kollaglue/${KOLLA_BASE_DISTRO}-${KOLLA_INSTALL_TYPE}-swift-base swift-ring-builder \
+      kolla/${KOLLA_BASE_DISTRO}-${KOLLA_INSTALL_TYPE}-swift-base swift-ring-builder \
       /etc/kolla/config/swift/container.builder add r1z1-${KOLLA_INTERNAL_ADDRESS}:6002/d${i} 1;
   done
 
   for ring in object account container; do
     docker run \
       -v /etc/kolla/config/swift/:/etc/kolla/config/swift/ \
-      kollaglue/${KOLLA_BASE_DISTRO}-${KOLLA_INSTALL_TYPE}-swift-base swift-ring-builder \
+      kolla/${KOLLA_BASE_DISTRO}-${KOLLA_INSTALL_TYPE}-swift-base swift-ring-builder \
       /etc/kolla/config/swift/${ring}.builder rebalance;
   done