openstack/kolla-ansible
Code Issues Proposed changes

Merge "Do not use bare variables in the ceph role"

Browse Source
This commit is contained in:
Jenkins 2016-05-31 15:57:31 +00:00 committed by Gerrit Code Review
commit 4ad1af1328
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/ceph/tasks/bootstrap_osds.yml
View File

@ -52,7 +52,7 @@
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/dev/:/dev/" - "/dev/:/dev/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
with_indexed_items: osds_bootstrap|default([]) with_indexed_items: "{{ osds_bootstrap|default([]) }}"
- name: Bootstrapping Ceph Cache OSDs - name: Bootstrapping Ceph Cache OSDs
kolla_docker: kolla_docker:
@ -84,4 +84,4 @@
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/dev/:/dev/" - "/dev/:/dev/"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
with_indexed_items: osds_cache_bootstrap|default([]) with_indexed_items: "{{ osds_cache_bootstrap|default([]) }}"

8
ansible/roles/ceph/tasks/do_reconfigure.yml
View File

@ -25,7 +25,7 @@
- name: Gathering OSD IDs - name: Gathering OSD IDs
command: "cat /var/lib/ceph/osd/{{ item['fs_uuid'] }}/whoami" command: "cat /var/lib/ceph/osd/{{ item['fs_uuid'] }}/whoami"
with_items: osds with_items: "{{ osds }}"
register: osd_ids register: osd_ids
changed_when: False changed_when: False
failed_when: osd_ids.rc != 0 failed_when: osd_ids.rc != 0
@ -38,7 +38,7 @@
register: ceph_osd_container_state register: ceph_osd_container_state
failed_when: ceph_osd_container_state.Running == false failed_when: ceph_osd_container_state.Running == false
when: inventory_hostname in groups['ceph-osd'] when: inventory_hostname in groups['ceph-osd']
with_items: osd_ids.results with_items: "{{ osd_ids.results }}"
- name: Ensuring the ceph_rgw container is up - name: Ensuring the ceph_rgw container is up
kolla_docker: kolla_docker:
@ -68,7 +68,7 @@
changed_when: false changed_when: false
failed_when: false failed_when: false
register: ceph_osd_check_results register: ceph_osd_check_results
with_items: osd_ids.results with_items: "{{ osd_ids.results }}"
when: inventory_hostname in groups['ceph-osd'] when: inventory_hostname in groups['ceph-osd']
- name: Check the configs in ceph_rgw container - name: Check the configs in ceph_rgw container
@ -96,7 +96,7 @@
name: "ceph_osd_{{ item.stdout }}" name: "ceph_osd_{{ item.stdout }}"
action: "get_container_env" action: "get_container_env"
register: ceph_osd_container_envs register: ceph_osd_container_envs
with_items: osd_ids.results with_items: "{{ osd_ids.results }}"
when: when:
- inventory_hostname in groups['ceph-osd'] - inventory_hostname in groups['ceph-osd']
- osds - osds

4
ansible/roles/ceph/tasks/start_osds.yml
View File

@ -18,11 +18,11 @@
state: mounted state: mounted
name: "/var/lib/ceph/osd/{{ item['fs_uuid'] }}" name: "/var/lib/ceph/osd/{{ item['fs_uuid'] }}"
opts: "{{ ceph_osd_mount_options }}" opts: "{{ ceph_osd_mount_options }}"
with_items: osds with_items: "{{ osds }}"
- name: Gathering OSD IDs - name: Gathering OSD IDs
command: "cat /var/lib/ceph/osd/{{ item['fs_uuid'] }}/whoami" command: "cat /var/lib/ceph/osd/{{ item['fs_uuid'] }}/whoami"
with_items: osds with_items: "{{ osds }}"
register: id register: id
changed_when: False changed_when: False
failed_when: id.rc != 0 failed_when: id.rc != 0