openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix duplicated words issue like "are are out of""

Browse Source
This commit is contained in:
Zuul 2020-01-06 12:25:39 +00:00 committed by Gerrit Code Review
commit 94def91405
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/library/kolla_docker.py
View File

@ -500,7 +500,7 @@ class DockerWorker(object):
current_dimensions = container_info['HostConfig']
for key1, key2 in dimension_map.items():
# NOTE(mgoddard): If a resource has been explicitly requested,
# check for a match. Otherwise, ensure is is set to the default.
# check for a match. Otherwise, ensure it is set to the default.
if key1 in new_dimensions:
if key1 == 'ulimits':
if self.compare_ulimits(new_dimensions[key1],

2
doc/source/reference/compute/qinling-guide.rst
View File

@ -98,5 +98,5 @@ put the content in ``/etc/kolla/config/qinling/qinling-engine.conf``.
cert_file = /etc/qinling/pki/kubernetes/qinling.crt
key_file = /etc/qinling/pki/kubernetes/qinling.key
``kube_host`` is the the Kubernetes cluster API address, ``https`` protocol
``kube_host`` is the Kubernetes cluster API address, ``https`` protocol
has to be defined.

2
specs/internal-tls-endpoints.rst
View File

@ -22,7 +22,7 @@ https://blueprints.launchpad.net/kolla-ansible/+spec/add-ssl-internal-network
This proposal describes implementation of the internal TLS encryption for
OpenStack services deployed with kolla-ansible, i.e. adding support to make
OpenStack internal and admin endpoints encrypted, as well as encrypting traffic
between HAProxy and OpenStack services. Other services that are are out of scope of this
between HAProxy and OpenStack services. Other services are out of scope of this
document. Also, more workflows (using company CA, using certificates already
provisioned on the hosts) are out of the scope, and shall be discussed separately.