diff options
| -rw-r--r-- | compose/README.md | 2 | ||||
| -rw-r--r-- | devenv/README.md | 2 | ||||
| -rw-r--r-- | docs/dev-quickstart.md | 4 | ||||
| -rwxr-xr-x | tools/kolla-compose (renamed from tools/kolla) | 0 | ||||
| -rw-r--r-- | tox.ini | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/compose/README.md b/compose/README.md index 4cd0cf63c..6300ff5b9 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 000bbd071..53f0a3417 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 <osp-service-container> up -d`. diff --git a/docs/dev-quickstart.md b/docs/dev-quickstart.md index 0f718e22e..6323166b6 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 index 4df9ea4db..4df9ea4db 100755 --- a/tools/kolla +++ b/tools/kolla-compose @@ -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 |