From aaeadcab12ca8b91d230bff4b08b74ab11d622ea Mon Sep 17 00:00:00 2001 From: Li Peng Date: Mon, 9 May 2016 15:12:01 +0800 Subject: [PATCH 1/2] cleanup: fix typos Signed-off-by: Li Peng --- README.md | 2 +- contrib/splitup.yml | 2 +- localrepo-site.yml.sample | 2 +- roles/ceph-common-coreos/README.md | 2 +- roles/ceph-mds/tasks/docker/start_docker_mds.yml | 2 +- roles/ceph-mon/tasks/ceph_keys.yml | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 809221244..04727cdb2 100644 --- a/README.md +++ b/README.md @@ -294,7 +294,7 @@ If Jenkins detects that your commit broke something it will turn red. You can then check the logs of the Jenkins by clicking on "Testing Playbooks" button in your PR and go to "Console Output". You can now submit a new commit/change that will update the CI system to run a new play. -It might happen that the CI does not get reloead so you can simply leave a comment on your PR with "test this please" and it will trigger a new CI build. +It might happen that the CI does not get reloaded so you can simply leave a comment on your PR with "test this please" and it will trigger a new CI build. ## Vagrant Demo diff --git a/contrib/splitup.yml b/contrib/splitup.yml index ecaa14835..fb6415b18 100644 --- a/contrib/splitup.yml +++ b/contrib/splitup.yml @@ -39,7 +39,7 @@ msg: 'github prefix missing! e.g: (--extra-vars github=ceph/ansible).' when: github == False - - name: split the repo in seperate branches + - name: split the repo in separate branches tags: split command: git subtree split --prefix=roles/{{ item }} -b {{ item }} --squash args: diff --git a/localrepo-site.yml.sample b/localrepo-site.yml.sample index 5984852d0..ce7d6755c 100644 --- a/localrepo-site.yml.sample +++ b/localrepo-site.yml.sample @@ -1,6 +1,6 @@ --- # Sample Playbook for local mirrors. -# Additional/optiona step to generate repos.d file for local mirrors. +# Additional/optional step to generate repos.d file for local mirrors. # Defines deployment design and assigns role to server groups - hosts: all diff --git a/roles/ceph-common-coreos/README.md b/roles/ceph-common-coreos/README.md index 8574a6f2d..b341a29b2 100644 --- a/roles/ceph-common-coreos/README.md +++ b/roles/ceph-common-coreos/README.md @@ -16,7 +16,7 @@ None. # Dependencies -New CoreOS releases support pypy in version 2.4 and above. Unfortunetly CoreOS stable channel +New CoreOS releases support pypy in version 2.4 and above. Unfortunately CoreOS stable channel has to be used with pypy in version 2.4 and below due to some dependency issues. # Example Playbook diff --git a/roles/ceph-mds/tasks/docker/start_docker_mds.yml b/roles/ceph-mds/tasks/docker/start_docker_mds.yml index 735529ff6..c0ee32fa8 100644 --- a/roles/ceph-mds/tasks/docker/start_docker_mds.yml +++ b/roles/ceph-mds/tasks/docker/start_docker_mds.yml @@ -1,5 +1,5 @@ --- -- name: run the ceph medata docker image +- name: run the ceph metadata docker image docker: image: "{{ ceph_mds_docker_username }}/{{ ceph_mds_docker_imagename }}" name: ceph-{{ ansible_hostname }}-mds diff --git a/roles/ceph-mon/tasks/ceph_keys.yml b/roles/ceph-mon/tasks/ceph_keys.yml index 36f5ab499..6c1c659a9 100644 --- a/roles/ceph-mon/tasks/ceph_keys.yml +++ b/roles/ceph-mon/tasks/ceph_keys.yml @@ -1,6 +1,6 @@ --- # NOTE (leseb): wait for mon discovery and quorum resolution -# the admin key is not instantanely created so we have to wait a bit +# the admin key is not instantaneously created so we have to wait a bit - name: wait for client.admin key exists wait_for: path: /etc/ceph/{{ cluster }}.client.admin.keyring From 92c48f3f2b4ab3987b1deaf4c17df9cb5e2bb11b Mon Sep 17 00:00:00 2001 From: Li Peng Date: Mon, 9 May 2016 15:14:13 +0800 Subject: [PATCH 2/2] cleanup: fix inappropriate variable names Signed-off-by: Li Peng --- roles/ceph-mds/tasks/docker/dirs_permissions.yml | 6 +++--- roles/ceph-restapi/tasks/docker/dirs_permissions.yml | 6 +++--- roles/ceph-rgw/tasks/docker/dirs_permissions.yml | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/roles/ceph-mds/tasks/docker/dirs_permissions.yml b/roles/ceph-mds/tasks/docker/dirs_permissions.yml index 9163b3095..dd94e5e9f 100644 --- a/roles/ceph-mds/tasks/docker/dirs_permissions.yml +++ b/roles/ceph-mds/tasks/docker/dirs_permissions.yml @@ -14,7 +14,7 @@ register: ceph_version - set_fact: - after_hamer=True + after_hammer=True when: ceph_version.stdout not in ['firefly','giant', 'hammer'] @@ -28,7 +28,7 @@ with_items: - /etc/ceph/ - /var/lib/ceph/bootstrap-mds - when: not after_hamer + when: not after_hammer - name: create bootstrap directories (after hammer) file: @@ -40,4 +40,4 @@ with_items: - /etc/ceph/ - /var/lib/ceph/bootstrap-mds - when: after_hamer + when: after_hammer diff --git a/roles/ceph-restapi/tasks/docker/dirs_permissions.yml b/roles/ceph-restapi/tasks/docker/dirs_permissions.yml index c1425caea..b827deecf 100644 --- a/roles/ceph-restapi/tasks/docker/dirs_permissions.yml +++ b/roles/ceph-restapi/tasks/docker/dirs_permissions.yml @@ -7,7 +7,7 @@ register: ceph_version - set_fact: - after_hamer=True + after_hammer=True when: ceph_version.stdout not in ['firefly','giant', 'hammer'] @@ -23,7 +23,7 @@ - /var/lib/ceph/bootstrap-osd - /var/lib/ceph/bootstrap-mds - /var/lib/ceph/bootstrap-rgw - when: not after_hamer + when: not after_hammer - name: create bootstrap directories (after hammer) file: @@ -37,4 +37,4 @@ - /var/lib/ceph/bootstrap-osd - /var/lib/ceph/bootstrap-mds - /var/lib/ceph/bootstrap-rgw - when: after_hamer + when: after_hammer diff --git a/roles/ceph-rgw/tasks/docker/dirs_permissions.yml b/roles/ceph-rgw/tasks/docker/dirs_permissions.yml index c5e325446..7973981d0 100644 --- a/roles/ceph-rgw/tasks/docker/dirs_permissions.yml +++ b/roles/ceph-rgw/tasks/docker/dirs_permissions.yml @@ -14,7 +14,7 @@ register: ceph_version - set_fact: - after_hamer=True + after_hammer=True when: ceph_version.stdout not in ['firefly','giant', 'hammer'] @@ -28,7 +28,7 @@ with_items: - /etc/ceph/ - /var/lib/ceph/bootstrap-rgw - when: not after_hamer + when: not after_hammer - name: create bootstrap directories (after hammer) file: @@ -40,4 +40,4 @@ with_items: - /etc/ceph/ - /var/lib/ceph/bootstrap-rgw - when: after_hamer + when: after_hammer