diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-19 14:41:07 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-19 14:41:07 +0000 |
| commit | 4cfeeed021f87e5064d6e04d67fc75a98512265b (patch) | |
| tree | 54f3135258f20f1c5088aaf328bb3719ba453aa2 | |
| parent | 11cdd5b8eafc880310bc2353b88eb716f0398314 (diff) | |
| parent | bdda9e40ea16936598a68460579922566bb4d81c (diff) | |
| download | kolla-4cfeeed021f87e5064d6e04d67fc75a98512265b.tar.gz kolla-4cfeeed021f87e5064d6e04d67fc75a98512265b.zip | |
Merge "Fix typos in docstrings:"
| -rw-r--r-- | docker/ceph/ceph-osd/extend_start.sh | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-agents/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | etc/kolla/globals.yml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/docker/ceph/ceph-osd/extend_start.sh b/docker/ceph/ceph-osd/extend_start.sh index 38a2a4234..94736c8a8 100644 --- a/docker/ceph/ceph-osd/extend_start.sh +++ b/docker/ceph/ceph-osd/extend_start.sh @@ -3,7 +3,7 @@ # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - # Formating disk for ceph + # Formatting disk for ceph sgdisk --zap-all -- "${OSD_DEV}" sgdisk --new=2:1M:5G --change-name=2:KOLLA_CEPH_JOURNAL --typecode=2:45B0969E-9B03-4F30-B4C6-B4B80CEFF106 --mbrtogpt -- "${OSD_DEV}" sgdisk --largest-new=1 --change-name=1:KOLLA_CEPH_DATA --typecode=1:4FBD7E29-9D25-41B8-AFD0-062C0CEFF05D -- "${OSD_DEV}" diff --git a/docker/neutron/neutron-agents/Dockerfile.j2 b/docker/neutron/neutron-agents/Dockerfile.j2 index a48ceb7b6..8b90871bd 100644 --- a/docker/neutron/neutron-agents/Dockerfile.j2 +++ b/docker/neutron/neutron-agents/Dockerfile.j2 @@ -28,8 +28,8 @@ RUN apt-get install -y --no-install-recommends \ {% endif %} {% endif %} -# TODO: SamYaple FWaaS is part of the l3-agent, not a seperate agent that is -# why this file is needed. To support FWaaS we cannot have a seperate container +# TODO: SamYaple FWaaS is part of the l3-agent, not a separate agent that is +# why this file is needed. To support FWaaS we cannot have a separate container # I need to figure out the best way to make this work together # # This file _does_ _not_ need to exist, you must remove referencing it from the diff --git a/etc/kolla/globals.yml b/etc/kolla/globals.yml index a5179e732..a1548eaa0 100644 --- a/etc/kolla/globals.yml +++ b/etc/kolla/globals.yml @@ -86,7 +86,7 @@ neutron_external_interface: "eth1" # Ceph options ################### # Ceph can be setup with a caching to improve performance. To use the cache you -# must provide seperate disks than those for the OSDs +# must provide separate disks than those for the OSDs # ceph_use_cache: "no" # Valid options are [ forward, none, writeback ] # ceph_cache_mode: writeback |