ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #765 from flyd1005/wip-fix-typo 

cleanup: fix typos and inappropriate variable names
pull/766/head
Leseb 2016-05-09 11:09:22 +02:00
parent 30f7208334 92c48f3f2b
commit 4cf2d98de3
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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 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. 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 ## Vagrant Demo

2
contrib/splitup.yml
View File

@ -39,7 +39,7 @@
msg: 'github prefix missing! e.g: (--extra-vars github=ceph/ansible).' msg: 'github prefix missing! e.g: (--extra-vars github=ceph/ansible).'
when: github == False when: github == False
- name: split the repo in seperate branches - name: split the repo in separate branches
tags: split tags: split
command: git subtree split --prefix=roles/{{ item }} -b {{ item }} --squash command: git subtree split --prefix=roles/{{ item }} -b {{ item }} --squash
args: args:

2
localrepo-site.yml.sample
View File

@ -1,6 +1,6 @@
--- ---
# Sample Playbook for local mirrors. # 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 # Defines deployment design and assigns role to server groups
- hosts: all - hosts: all

2
roles/ceph-common-coreos/README.md
View File

@ -16,7 +16,7 @@ None.
# Dependencies # 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. has to be used with pypy in version 2.4 and below due to some dependency issues.
# Example Playbook # Example Playbook

6
roles/ceph-mds/tasks/docker/dirs_permissions.yml
View File

@ -14,7 +14,7 @@
register: ceph_version register: ceph_version
- set_fact: - set_fact:
after_hamer=True after_hammer=True
when: when:
ceph_version.stdout not in ['firefly','giant', 'hammer'] ceph_version.stdout not in ['firefly','giant', 'hammer']
@ -28,7 +28,7 @@
with_items: with_items:
- /etc/ceph/ - /etc/ceph/
- /var/lib/ceph/bootstrap-mds - /var/lib/ceph/bootstrap-mds
when: not after_hamer when: not after_hammer
- name: create bootstrap directories (after hammer) - name: create bootstrap directories (after hammer)
file: file:
@ -40,4 +40,4 @@
with_items: with_items:
- /etc/ceph/ - /etc/ceph/
- /var/lib/ceph/bootstrap-mds - /var/lib/ceph/bootstrap-mds
when: after_hamer when: after_hammer

2
roles/ceph-mds/tasks/docker/start_docker_mds.yml
View File

@ -1,5 +1,5 @@
--- ---
- name: run the ceph medata docker image - name: run the ceph metadata docker image
docker: docker:
image: "{{ ceph_mds_docker_username }}/{{ ceph_mds_docker_imagename }}" image: "{{ ceph_mds_docker_username }}/{{ ceph_mds_docker_imagename }}"
name: ceph-{{ ansible_hostname }}-mds name: ceph-{{ ansible_hostname }}-mds

2
roles/ceph-mon/tasks/ceph_keys.yml
View File

@ -1,6 +1,6 @@
--- ---
# NOTE (leseb): wait for mon discovery and quorum resolution # 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 - name: wait for client.admin key exists
wait_for: wait_for:
path: /etc/ceph/{{ cluster }}.client.admin.keyring path: /etc/ceph/{{ cluster }}.client.admin.keyring

6
roles/ceph-restapi/tasks/docker/dirs_permissions.yml
View File

@ -7,7 +7,7 @@
register: ceph_version register: ceph_version
- set_fact: - set_fact:
after_hamer=True after_hammer=True
when: when:
ceph_version.stdout not in ['firefly','giant', 'hammer'] ceph_version.stdout not in ['firefly','giant', 'hammer']
@ -23,7 +23,7 @@
- /var/lib/ceph/bootstrap-osd - /var/lib/ceph/bootstrap-osd
- /var/lib/ceph/bootstrap-mds - /var/lib/ceph/bootstrap-mds
- /var/lib/ceph/bootstrap-rgw - /var/lib/ceph/bootstrap-rgw
when: not after_hamer when: not after_hammer
- name: create bootstrap directories (after hammer) - name: create bootstrap directories (after hammer)
file: file:
@ -37,4 +37,4 @@
- /var/lib/ceph/bootstrap-osd - /var/lib/ceph/bootstrap-osd
- /var/lib/ceph/bootstrap-mds - /var/lib/ceph/bootstrap-mds
- /var/lib/ceph/bootstrap-rgw - /var/lib/ceph/bootstrap-rgw
when: after_hamer when: after_hammer

6
roles/ceph-rgw/tasks/docker/dirs_permissions.yml
View File

@ -14,7 +14,7 @@
register: ceph_version register: ceph_version
- set_fact: - set_fact:
after_hamer=True after_hammer=True
when: when:
ceph_version.stdout not in ['firefly','giant', 'hammer'] ceph_version.stdout not in ['firefly','giant', 'hammer']
@ -28,7 +28,7 @@
with_items: with_items:
- /etc/ceph/ - /etc/ceph/
- /var/lib/ceph/bootstrap-rgw - /var/lib/ceph/bootstrap-rgw
when: not after_hamer when: not after_hammer
- name: create bootstrap directories (after hammer) - name: create bootstrap directories (after hammer)
file: file:
@ -40,4 +40,4 @@
with_items: with_items:
- /etc/ceph/ - /etc/ceph/
- /var/lib/ceph/bootstrap-rgw - /var/lib/ceph/bootstrap-rgw
when: after_hamer when: after_hammer