diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-20 15:47:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-20 15:47:34 +0000 |
| commit | 6d89528171d198245e102c9375d221113c44ccb6 (patch) | |
| tree | 52c706b2bc0399761e0ce55a149b365bdaa41b0c /doc | |
| parent | f2a2b69c6a73f3eb342c1d05ec984e11be5e0dfa (diff) | |
| parent | 000289861777d8c7cd5e2315595274cd2ac3a417 (diff) | |
| download | kolla-6d89528171d198245e102c9375d221113c44ccb6.tar.gz kolla-6d89528171d198245e102c9375d221113c44ccb6.zip | |
Merge "Fix the location of Kolla configurations in the evaluation workflow"
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/quickstart.rst | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/doc/quickstart.rst b/doc/quickstart.rst index da9853cca..730635e97 100644 --- a/doc/quickstart.rst +++ b/doc/quickstart.rst @@ -50,7 +50,7 @@ and OverlayFS. In order to update kernel in Ubuntu 14.04 LTS to 4.2, run: apt-get install linux-image-generic-lts-wily .. attention:: Operators performing an evaluation or deployment should use a - stable branch. Operators performing development (or developers) should use + stable release. Operators performing development (or developers) should use master. .. note:: Install is *very* sensitive about version of components. Please @@ -280,13 +280,12 @@ Install Kolla and its dependencies: pip install kolla -Kolla holds configurations files in ``etc/kolla``. Copy the configuration files -to ``/etc``: +Kolla holds configurations files in ``/usr/share/kolla/etc_examples/kolla/``. +Copy the configuration files to ``/etc``: :: - cd kolla - cp -r etc/kolla /etc/ + cp -r /usr/share/kolla/etc_examples/kolla /etc/ Installing Kolla and dependencies for development ------------------------------------------------- |