summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-05-04 04:48:12 +0000
committerGerrit Code Review <review@openstack.org>2018-05-04 04:48:12 +0000
commit27381101bce3454e03b692d5330428b0a2268c46 (patch)
treebed49fb5437a4f342bd37d77f63b0bf7ffed0987 /doc
parentbbffb25bf571f3a860e637fd9f2a6eec79102f8e (diff)
parent6f441ccd1bc1226a31884e735aeb80e248189ee6 (diff)
downloadkolla-27381101bce3454e03b692d5330428b0a2268c46.tar.gz
kolla-27381101bce3454e03b692d5330428b0a2268c46.zip
Merge "Clarify how to generate kolla-build.conf in docs"
Diffstat (limited to 'doc')
-rw-r--r--doc/source/admin/image-building.rst7
1 files changed, 6 insertions, 1 deletions
diff --git a/doc/source/admin/image-building.rst b/doc/source/admin/image-building.rst
index 96f20820a..d58871ba1 100644
--- a/doc/source/admin/image-building.rst
+++ b/doc/source/admin/image-building.rst
@@ -20,7 +20,12 @@ Generating kolla-build.conf
Install tox and generate the build configuration. The build configuration is
designed to hold advanced customizations when building images.
-Generate the ``kolla-build.conf`` file using the following steps.
+If you have already cloned the Kolla Git repository to the ``kolla`` folder,
+generate the ``kolla-build.conf`` file using the following steps.
+
+If you don't, you can also run ``kolla-build`` without a ``kolla-build.conf``
+or with the file you find in the ``etc_examples`` folder of the Kolla pip package.
+But you should only do that for testing purposes, if at all.
.. code-block:: console