Skip to content
Snippets Groups Projects
Commit 06c2eb43 authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review
Browse files

Merge "Delete the unnecessary space"

parents d10015db ef401e35
No related branches found
No related tags found
No related merge requests found
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
Production architecture guide Production architecture guide
============================= =============================
This guide will help with configuring Kolla to suit production needs. It is This guide will help with configuring Kolla to suit production needs. It is
meant to answer some questions regarding basic configuration options that Kolla meant to answer some questions regarding basic configuration options that Kolla
requires. This document also contains other useful pointers. requires. This document also contains other useful pointers.
...@@ -39,7 +39,7 @@ In Kolla operators should configure following network interfaces: ...@@ -39,7 +39,7 @@ In Kolla operators should configure following network interfaces:
* api_interface - This interface is used for the management network. The * api_interface - This interface is used for the management network. The
management network is the network OpenStack services uses to communicate to management network is the network OpenStack services uses to communicate to
each other and the databases. There are know security risks here, so it's each other and the databases. There are know security risks here, so it's
recommended to make this network internal, not accessible from outside. recommended to make this network internal, not accessible from outside.
Defaults to network_interface. Defaults to network_interface.
......
...@@ -22,10 +22,10 @@ a real physical volume or a loopback mounted file for development. ...@@ -22,10 +22,10 @@ a real physical volume or a loopback mounted file for development.
The Cinder community has closed a bug as WontFix which makes it The Cinder community has closed a bug as WontFix which makes it
impossible for LVM to be used at all in a multi-controller setup. impossible for LVM to be used at all in a multi-controller setup.
The only option for multi-controller storage to work correctly at The only option for multi-controller storage to work correctly at
present is via a Ceph deployment. If community members disagree present is via a Ceph deployment. If community members disagree
with this decision, please report the specific use case in the with this decision, please report the specific use case in the
Cinder bug tracker here: Cinder bug tracker here:
`_bug 1571211 <https://launchpad.net/bugs/1571211>`__. `_bug 1571211 <https://launchpad.net/bugs/1571211>`__.
Create a Volume Group Create a Volume Group
......
...@@ -164,7 +164,7 @@ Put ceph.conf and keyring file into ``/etc/kolla/config/nova``: ...@@ -164,7 +164,7 @@ Put ceph.conf and keyring file into ``/etc/kolla/config/nova``:
:: ::
$ ls /etc/kolla/config/nova $ ls /etc/kolla/config/nova
ceph.client.nova.keyring ceph.conf ceph.client.nova.keyring ceph.conf
Configure nova-compute to use Ceph as the ephemeral backend by creating Configure nova-compute to use Ceph as the ephemeral backend by creating
``/etc/kolla/config/nova/nova-compute.conf`` and adding the following ``/etc/kolla/config/nova/nova-compute.conf`` and adding the following
......
...@@ -19,7 +19,7 @@ file. ...@@ -19,7 +19,7 @@ file.
:: ::
ExecStart= -H tcp://172.16.1.13:2375 -H unix:///var/run/docker.sock --cluster-store=etcd://172.16.1.13:2379 --cluster-advertise=172.16.1.13:2375 ExecStart= -H tcp://172.16.1.13:2375 -H unix:///var/run/docker.sock --cluster-store=etcd://172.16.1.13:2379 --cluster-advertise=172.16.1.13:2375
The IP address is host runnning the etcd service. ```2375``` is port that allows The IP address is host runnning the etcd service. ```2375``` is port that allows
Docker daemon to be accessed remotely. ```2379``` is the etcd listening port. Docker daemon to be accessed remotely. ```2379``` is the etcd listening port.
......
...@@ -51,7 +51,7 @@ and OverlayFS. In order to update kernel in Ubuntu 14.04 LTS to 4.2, run: ...@@ -51,7 +51,7 @@ and OverlayFS. In order to update kernel in Ubuntu 14.04 LTS to 4.2, run:
.. WARNING:: .. WARNING::
Operators performing an evaluation or deployment should use a stable Operators performing an evaluation or deployment should use a stable
branch. Operators performing development (or developers) should use branch. Operators performing development (or developers) should use
master. master.
.. note:: Install is *very* sensitive about version of components. Please .. note:: Install is *very* sensitive about version of components. Please
...@@ -253,7 +253,7 @@ On CentOS or RHEL systems, this can be done using: ...@@ -253,7 +253,7 @@ On CentOS or RHEL systems, this can be done using:
yum install ansible yum install ansible
Many DEB based systems do not meet Kolla's Ansible version requirements. It is Many DEB based systems do not meet Kolla's Ansible version requirements. It is
recommended to use pip to install Ansible >2.0. Finally Ansible >2.0 may be recommended to use pip to install Ansible >2.0. Finally Ansible >2.0 may be
installed using: installed using:
:: ::
...@@ -270,7 +270,7 @@ requirements it can be installed by: ...@@ -270,7 +270,7 @@ requirements it can be installed by:
.. WARNING:: .. WARNING::
Kolla uses PBR in its implementation. PBR provides version information Kolla uses PBR in its implementation. PBR provides version information
to Kolla about the package in use. This information is later used when to Kolla about the package in use. This information is later used when
building images to specify the Docker tag used in the image built. When building images to specify the Docker tag used in the image built. When
installing the Kolla package via pip, PBR will always use the PBR version installing the Kolla package via pip, PBR will always use the PBR version
information. When obtaining a copy of the software via git, PBR will use information. When obtaining a copy of the software via git, PBR will use
the git version information, but **ONLY** if Kolla has not been pip the git version information, but **ONLY** if Kolla has not been pip
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment