aboutsummaryrefslogtreecommitdiff
path: root/doc/image-building.rst
diff options
context:
space:
mode:
authorMartin André <m.andre@redhat.com>2015-09-21 20:12:45 +0900
committerMartin André <m.andre@redhat.com>2015-09-21 21:20:48 +0900
commit6c5aeeee41b8e4b0fe7fb246bf9b8a0c35613232 (patch)
tree06dcd58699077ab2257e262f7e29ba85aec8af18 /doc/image-building.rst
parent75f988c7ec83c91345db3235eb1c122380f7429c (diff)
downloadkolla-6c5aeeee41b8e4b0fe7fb246bf9b8a0c35613232.tar.gz
kolla-6c5aeeee41b8e4b0fe7fb246bf9b8a0c35613232.zip
Consolidate kolla-build configuration in one file
The source location definition previously in build.ini was merged in etc/kolla/kolla-build.conf since it is really configuration for the kolla-build tool. Change-Id: I7531af0029bdfeabbaefb8a6aa97b70bb12c021a Closes-Bug: #1496702
Diffstat (limited to 'doc/image-building.rst')
-rw-r--r--doc/image-building.rst6
1 files changed, 4 insertions, 2 deletions
diff --git a/doc/image-building.rst b/doc/image-building.rst
index 1d8c4fdc0..e7008db59 100644
--- a/doc/image-building.rst
+++ b/doc/image-building.rst
@@ -75,8 +75,10 @@ You can change it to ``source`` using the following command:
tools/build.py -t source
-The locations of OpenStack source code are written in ``build.ini``.
-Now the source type support ``url`` and ``git``. The ``build.ini`` looks like:
+The locations of OpenStack source code are written in
+``etc/kolla/kolla-build.conf``.
+Now the source type support ``url`` and ``git``. The
+``etc/kolla/kolla-build.conf`` looks like:
::