From 3f063626a2f217d7bf37c287bf6a216811dee58d Mon Sep 17 00:00:00 2001 From: "Swapnil Kulkarni (coolsvap)" Date: Tue, 14 Jun 2016 12:32:50 +0530 Subject: [PATCH] Update kollaglue repo on docker to kolla [1] http://lists.openstack.org/pipermail/openstack-dev/2016-June/097227.html Change-Id: I73af59dcf1e755dbe0579486f1fb0ebe5ca0119c Closes-Bug: #1592286 --- README.rst | 6 +++--- ansible/group_vars/all.yml | 2 +- doc/heat-dev-env.rst | 2 +- doc/image-building.rst | 2 +- doc/quickstart.rst | 2 +- doc/swift-guide.rst | 14 +++++++------- kolla/common/config.py | 2 +- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/README.rst b/README.rst index d826819957..0720b70b51 100644 --- a/README.rst +++ b/README.rst @@ -73,13 +73,13 @@ are built by the Kolla project maintainers. A detailed process for contributing to the images can be found in the `image building guide `__. -The Kolla developers build images in the `kollaglue` namespace for every tagged +The Kolla developers build images in the `kolla` namespace for every tagged release and implement an Ansible deployment for many but not all of them. You can view the available images on `Docker Hub -`__ or with the Docker CLI:: +`__ or with the Docker CLI:: - $ sudo docker search kollaglue + $ sudo docker search kolla Directories =========== diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 007919e9b3..18aaa0267a 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -52,7 +52,7 @@ database_port: "3306" #################### docker_registry_email: docker_registry: -docker_namespace: "kollaglue" +docker_namespace: "kolla" docker_registry_username: # Valid options are [ never, on-failure, always ] diff --git a/doc/heat-dev-env.rst b/doc/heat-dev-env.rst index c711b8c60e..4b320b88a8 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 eb70d8aaaf..cdafffdfaa 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 3dd1cc5ba1..f6a81528df 100644 --- a/doc/quickstart.rst +++ b/doc/quickstart.rst @@ -616,5 +616,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 c241d2f3f8..5e61d16b19 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 diff --git a/kolla/common/config.py b/kolla/common/config.py index b1224d09eb..0e02b70a80 100644 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -89,7 +89,7 @@ _CLI_OPTS = [ help='Show image dependencies (filtering supported)'), cfg.BoolOpt('list-images', help='Show all available images'), - cfg.StrOpt('namespace', short='n', default='kollaglue', + cfg.StrOpt('namespace', short='n', default='kolla', deprecated_group='kolla-build', help='The Docker namespace name'), cfg.BoolOpt('cache', default=True,