diff --git a/ansible/library/kolla_docker.py b/ansible/library/kolla_docker.py index fe0264c38c..7b150f078e 100644 --- a/ansible/library/kolla_docker.py +++ b/ansible/library/kolla_docker.py @@ -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], diff --git a/doc/source/reference/compute/qinling-guide.rst b/doc/source/reference/compute/qinling-guide.rst index 68839ff5d1..2f5b81e876 100644 --- a/doc/source/reference/compute/qinling-guide.rst +++ b/doc/source/reference/compute/qinling-guide.rst @@ -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. diff --git a/specs/internal-tls-endpoints.rst b/specs/internal-tls-endpoints.rst index e902db0349..f2b23db0b5 100644 --- a/specs/internal-tls-endpoints.rst +++ b/specs/internal-tls-endpoints.rst @@ -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.