diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-22 15:20:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-22 15:20:39 +0000 |
| commit | f013f2e8160847a386efef95cd58a6f31eabff57 (patch) | |
| tree | 92a93b90d177c14d391c04f5b7aa2a26ae5ae7ac | |
| parent | e410386e45d518673855a3935ede6e10648f0529 (diff) | |
| parent | 23555a6936d36bb8148102b75f47b726484c2fd9 (diff) | |
| download | kolla-f013f2e8160847a386efef95cd58a6f31eabff57.tar.gz kolla-f013f2e8160847a386efef95cd58a6f31eabff57.zip | |
Merge "add the kolla-build.conf generation doc"2.0.0.0b2
| -rw-r--r-- | doc/image-building.rst | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/doc/image-building.rst b/doc/image-building.rst index 935df31d4..ba07bbad4 100644 --- a/doc/image-building.rst +++ b/doc/image-building.rst @@ -67,9 +67,14 @@ To trigger build.py to pull images from local registry, the Docker configuration needs to be modified. See `Docker Insecure Registry Config`_. -The build script reads its configuration from ``/etc/kolla/kolla-build.conf`` -or ``etc/kolla/kolla-build.conf``. This is where to change the default -settings. +The build configuration can be customised using a config file, the default +location being one of ``/etc/kolla/kolla-build.conf`` or +``etc/kolla/kolla-build.conf``. This file can be generated using the following +command: + +:: + + tox -e genconfig Build OpenStack from Source |