diff --git a/README.rst b/README.rst index 3ee07a1d..d1e23c57 100644 --- a/README.rst +++ b/README.rst @@ -46,9 +46,10 @@ detailed in the LICENSE file. * Free software: Apache license * Design documentation: `Tricircle Design Blueprint `_ * Wiki: https://wiki.openstack.org/wiki/tricircle -* Installation guide: https://github.com/openstack/tricircle/blob/master/doc/source -* Tricircle Admin API documentation: https://github.com/openstack/tricircle/blob/master/doc/source/api_v1.rst -* Source: https://github.com/openstack/tricircle +* Installation guide: http://docs.openstack.org/developer/tricircle/installation-guide.html +* Tricircle Admin API documentation: http://docs.openstack.org/developer/tricircle/api_v1.html +* Source: http://git.openstack.org/cgit/openstack/tricircle * Bugs: http://bugs.launchpad.net/tricircle -* Blueprints: https://launchpad.net/tricircle -* Release notes: https://github.com/openstack/tricircle/tree/master/releasenotes/notes \ No newline at end of file +* Blueprints: https://blueprints.launchpad.net/tricircle +* Release notes: https://github.com/openstack/tricircle/tree/master/releasenotes/notes +* Contributing: http://docs.openstack.org/developer/tricircle/contributing.html \ No newline at end of file diff --git a/doc/source/index.rst b/doc/source/index.rst index f614d5cd..56b842b5 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -12,14 +12,15 @@ Contents: :maxdepth: 2 readme - installation usage + installation-guide api_v1 contributing + Indices and tables ================== * :ref:`genindex` * :ref:`modindex` -* :ref:`search` +* :ref:`search` \ No newline at end of file diff --git a/doc/source/installation-guide.rst b/doc/source/installation-guide.rst new file mode 100644 index 00000000..1927a32d --- /dev/null +++ b/doc/source/installation-guide.rst @@ -0,0 +1,14 @@ +iInstallation Guide +-------------------------- +Now the Tricircle can be played with Devstack for all-in-one single pod and +multi-pod. You can build different Tricircle environment with Devstack +according to your needs. In the near future there will be a manual installation +guide in this installation guide that discussing how to install the Tricircle +step by step without DevStack for users who install OpenStack manually. + + + + + +.. include:: ./single-pod-installation-devstack.rst +.. include:: ./multi-pod-installation-devstack.rst