Update kollaglue repo on docker to kolla
[1] http://lists.openstack.org/pipermail/openstack-dev/2016-June/097227.html Conflicts: doc/image-building.rst kolla/common/config.py Change-Id: I51f7064ed60047f5da578a9f5a2e47c15b07fea3 Closes-Bug: #1592286 (cherry picked from commit I73af59dcf1e755dbe0579486f1fb0ebe5ca0119c)
This commit is contained in:
parent
5f6d287644
commit
034f89dbd0
|
@ -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 <http://docs.openstack.org/developer/kolla/image-building.html>`__.
|
||||
|
||||
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
|
||||
<https://hub.docker.com/u/kollaglue/>`__ or with the Docker CLI::
|
||||
<https://hub.docker.com/u/kolla/>`__ or with the Docker CLI::
|
||||
|
||||
$ sudo docker search kollaglue
|
||||
$ sudo docker search kolla
|
||||
|
||||
Directories
|
||||
===========
|
||||
|
|
|
@ -46,7 +46,7 @@ database_user: "root"
|
|||
####################
|
||||
docker_registry_email:
|
||||
docker_registry:
|
||||
docker_namespace: "kollaglue"
|
||||
docker_namespace: "kolla"
|
||||
docker_registry_username:
|
||||
|
||||
# Valid options are [ never, on-failure, always ]
|
||||
|
|
|
@ -160,7 +160,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.
|
||||
|
||||
|
|
|
@ -49,7 +49,7 @@ If you want to build multiple images e.g. keystone and nova, use the following c
|
|||
$ tools/build.py keystone nova
|
||||
|
||||
|
||||
``tools/build.py`` use ``kollaglue`` as default namespace. If you
|
||||
``tools/build.py`` use ``kolla`` as default namespace. If you
|
||||
want to push images to your dockerhub, change the namespace like:
|
||||
|
||||
::
|
||||
|
|
|
@ -76,46 +76,46 @@ 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
|
||||
|
||||
|
|
|
@ -78,7 +78,7 @@ _CLI_OPTS = [
|
|||
cfg.BoolOpt('keep', default=False,
|
||||
deprecated_group='kolla-build',
|
||||
help='Keep failed intermediate containers'),
|
||||
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,
|
||||
|
|
Loading…
Reference in New Issue