diff --git a/docker/base/sources.list b/docker/base/sources.list index a57d337a06..d63541f027 100644 --- a/docker/base/sources.list +++ b/docker/base/sources.list @@ -3,7 +3,7 @@ deb http://archive.ubuntu.com/ubuntu/ trusty main restricted universe multiverse deb http://archive.ubuntu.com/ubuntu/ trusty-updates main restricted universe multiverse deb http://archive.ubuntu.com/ubuntu/ trusty-security main restricted universe multiverse -# Backports have a lower priority and must be explictly installed to be used +# Backports have a lower priority and must be explicitly installed to be used deb http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse # We need to add the Liberty repo for the updated packages they provide. The main diff --git a/docker/dind/start.sh b/docker/dind/start.sh index 61a4b09e9d..56e7334095 100644 --- a/docker/dind/start.sh +++ b/docker/dind/start.sh @@ -3,7 +3,7 @@ set -o errexit set -o nounset -# External processes will be occuring and we must wait for them +# External processes will be occurring and we must wait for them while [[ ! -e "/kolla_dind_ready" ]]; do sleep 1 done diff --git a/docker/neutron/neutron-agents/Dockerfile.j2 b/docker/neutron/neutron-agents/Dockerfile.j2 index 8b90871bdf..ce4b7202dc 100644 --- a/docker/neutron/neutron-agents/Dockerfile.j2 +++ b/docker/neutron/neutron-agents/Dockerfile.j2 @@ -44,7 +44,7 @@ COPY config-sudoers.sh /var/lib/kolla/ COPY start.sh / -# We will remove this line in Docker 1.10 when namespace propogation works +# We will remove this line in Docker 1.10 when namespace propagation works VOLUME /run/netns CMD ["/start.sh"] diff --git a/docker/neutron/neutron-base/ip_wrapper.py b/docker/neutron/neutron-base/ip_wrapper.py index 33177d03e9..b7c77c3d11 100644 --- a/docker/neutron/neutron-base/ip_wrapper.py +++ b/docker/neutron/neutron-base/ip_wrapper.py @@ -40,7 +40,7 @@ def host_mnt_exec(cmd): except Exception as e: print( - "An error has occured with a component that Kolla manages." + "An error has occurred with a component that Kolla manages." " Please file a bug") print("Error: ", e) diff --git a/specs/ansible-multi.rst b/specs/ansible-multi.rst index cacd44c3b0..3fc2764f24 100644 --- a/specs/ansible-multi.rst +++ b/specs/ansible-multi.rst @@ -23,7 +23,7 @@ To implement HA in our containers, we need multi-node deployment operational so we can validate the high availability implementation. To meet our community approved mission, we must implement a deployment tool -and Ansible provides the most effecient development path while ensuring ease +and Ansible provides the most efficient development path while ensuring ease of use. Use cases diff --git a/specs/containerize-openstack.rst b/specs/containerize-openstack.rst index f035ec2e04..11d775d463 100644 --- a/specs/containerize-openstack.rst +++ b/specs/containerize-openstack.rst @@ -189,7 +189,7 @@ with the --privileged=true flag to docker that: * shares any namespace with the --ipc=host, --pid=host, or --net=host flags We will not use the Docker EXPOSE operation since all containers will use ---net=host. One motive for using --net=host is it is inherently simplier. +--net=host. One motive for using --net=host is it is inherently simpler. A different motive for not using EXPOSE is the 20 microsecond penalty applied to every packet forwarded and returned by docker-proxy. If EXPOSE functionality is desired, it can be added back by diff --git a/specs/template.rst b/specs/template.rst index 8258ed16cf..27b93152f4 100644 --- a/specs/template.rst +++ b/specs/template.rst @@ -95,7 +95,7 @@ How are you proposing to test this feature. Documentation Impact ==================== -What documentation will be done to discribe this feature to developers +What documentation will be done to describe this feature to developers and operators. References