From e245eb2ff558e2fd77b37b57a56ad4583ef268a5 Mon Sep 17 00:00:00 2001 From: digambar Date: Mon, 27 Jul 2015 12:13:53 +0530 Subject: [PATCH] Implement kolla-compose script Renamed kolla script to kolla-compose Update change in the dev guide also Change-Id: I6cae3d13752ecb4bb3deeb91c5e0f827fde80c2a Implements: blueprint kolla-compose-script --- compose/README.md | 2 +- devenv/README.md | 2 +- docs/dev-quickstart.md | 4 ++-- tools/{kolla => kolla-compose} | 0 tox.ini | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) rename tools/{kolla => kolla-compose} (100%) diff --git a/compose/README.md b/compose/README.md index 4cd0cf63c8..6300ff5b90 100644 --- a/compose/README.md +++ b/compose/README.md @@ -7,7 +7,7 @@ installation of openstack. Running the 'tools/genenv' script creates an 'openrc' to allow access to the installation. Once you have run that you can either manually start the containers using the -'docker-compose' command or try the 'tools/kolla start' script which tries to +'docker-compose' command or try the 'tools/kolla-compose start' script which tries to start them all in a reasonable order, waiting at key points for services to become available. Once stood up you can issue the typical openstack commands to use the installation. If using nova networking use: diff --git a/devenv/README.md b/devenv/README.md index 000bbd071c..53f0a34171 100644 --- a/devenv/README.md +++ b/devenv/README.md @@ -120,7 +120,7 @@ you can edit for a different setup. Next, run the start script. - $ ./tools/kolla start + $ ./tools/kolla-compose start The `start` script is responsible for starting the containers using `docker-compose -f up -d`. diff --git a/docs/dev-quickstart.md b/docs/dev-quickstart.md index 0f718e22e5..6323166b67 100644 --- a/docs/dev-quickstart.md +++ b/docs/dev-quickstart.md @@ -90,11 +90,11 @@ interface name in `compose/openstack.env`: Next, run the start command: - $ sudo ./tools/kolla start + $ sudo ./tools/kolla-compose start Finally, run the status command: - $ sudo ./tools/kolla status + $ sudo ./tools/kolla-compose status This will display information about all Kolla containers. diff --git a/tools/kolla b/tools/kolla-compose similarity index 100% rename from tools/kolla rename to tools/kolla-compose diff --git a/tox.ini b/tox.ini index 55409f5d4c..76b006c316 100644 --- a/tox.ini +++ b/tox.ini @@ -44,7 +44,7 @@ commands = whitelist_externals = bash commands = bash -c tools/genenv - sudo tools/kolla start + sudo tools/kolla-compose start # this can be improved after https://review.openstack.org/#/c/180729/ # tools/test-deploy