openstack/qinling
Code Issues Proposed changes

Merge "Some improvements for the doc"

Browse Source
This commit is contained in:
Zuul 2018-11-06 10:02:21 +00:00 committed by Gerrit Code Review
commit 34b5b5aa1f
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 For etcd installation, you can refer to
`OpenStack Installation Guide <https://docs.openstack.org/install-guide/environment-etcd.html>`_. `OpenStack Installation Guide <https://docs.openstack.org/install-guide/environment-etcd.html>`_.
#. Config kubernetes in Qinling. Refer to Qinling could also connect with existing kubernetes and etcd services,
`Config Qinling using existing Kubernetes cluster <https://docs.openstack.org/qinling/latest/admin/install/config_kubernetes.html>`_. `here <https://docs.openstack.org/qinling/latest/admin/install/config_kubernetes.html>`_
is the guide for the detailed configuration.
#. 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
Finalize installation 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 * 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 cluster for Qinling services, which means you don't need to add etcd to
the enabled services list in the ``local.conf`` file. the enabled services list in the ``local.conf`` file.
* If you already have an existing kubernetes cluster, add * If you already have an existing kubernetes/etcd cluster, add
``QINLING_INSTALL_K8S=False`` to the ``local.conf`` file. Go to ``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>`_ `Config Qinling with existing Kubernetes cluster <https://docs.openstack.org/qinling/latest/admin/install/config_kubernetes.html>`_
for more details. for more configuration details.
* If you want to interact with Qinling in Horizon, add * If you want to interact with Qinling in Horizon dashboard, add the following
``enable_plugin qinling-dashboard https://git.openstack.org/openstack/qinling-dashboard`` line to the ``local.conf`` file.
in the ``local.conf`` file.
.. code-block:: console
enable_plugin qinling-dashboard https://git.openstack.org/openstack/qinling-dashboard
.. end
Running devstack Running devstack
---------------- ----------------