openstack/qinling
Code Issues Proposed changes

Some improvements for the doc

Browse Source 
Story: 2004206
Task: 27768
Change-Id: I27b4caffd21c0ccc114ab98689e25b544e38bf18
This commit is contained in:
Lingxian Kong 2018-11-05 15:09:59 +13:00
parent 448cf1c90a
commit 06c9c36083
2 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
doc/source/admin/install/install_ubuntu.rst
View File

@ -302,18 +302,9 @@ information.
For etcd installation, you can refer to
`OpenStack Installation Guide <https://docs.openstack.org/install-guide/environment-etcd.html>`_.
#. Config kubernetes in Qinling. Refer to
`Config Qinling using existing Kubernetes cluster <https://docs.openstack.org/qinling/latest/admin/install/config_kubernetes.html>`_.
#. Config etcd. In the ``[etcd]`` section of ``/etc/qinling/qinling.conf``,
configure the IP address and port that etcd service is listening on.
.. code-block:: ini
[etcd]
...
host = 10.0.0.9
port = 2379
Qinling could also connect with existing kubernetes and etcd services,
`here <https://docs.openstack.org/qinling/latest/admin/install/config_kubernetes.html>`_
is the guide for the detailed configuration.
Finalize installation
---------------------

18
doc/source/contributor/development-environment-devstack.rst
View File

@ -85,13 +85,19 @@ Here are several things you could customize:
* Devstack will set up a new kubernetes cluster and re-use etcd service inside
the cluster for Qinling services, which means you don't need to add etcd to
the enabled services list in the ``local.conf`` file.
* If you already have an existing kubernetes cluster, add
``QINLING_INSTALL_K8S=False`` to the ``local.conf`` file. Go to
* If you already have an existing kubernetes/etcd cluster, add
``QINLING_INSTALL_K8S=False`` to the ``local.conf`` file. You need to
manually config Qinling services after devstack completes, go to
`Config Qinling with existing Kubernetes cluster <https://docs.openstack.org/qinling/latest/admin/install/config_kubernetes.html>`_
for more details.
* If you want to interact with Qinling in Horizon, add
``enable_plugin qinling-dashboard https://git.openstack.org/openstack/qinling-dashboard``
in the ``local.conf`` file.
for more configuration details.
* If you want to interact with Qinling in Horizon dashboard, add the following
line to the ``local.conf`` file.
.. code-block:: console
enable_plugin qinling-dashboard https://git.openstack.org/openstack/qinling-dashboard
.. end
Running devstack
----------------