aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-06 19:12:40 +0000
committerGerrit Code Review <review@openstack.org>2016-07-06 19:12:40 +0000
commita459a29433d6fb274843ce43dd3b5719bf419c5d (patch)
tree67470fb8ce1c109c2eb12a3ae9ca72ca14232cfc
parentaccbd6bf9745a3b6f20272826cbfa3e9b370da09 (diff)
parent2d4161de632e6a2b18bef2be0802819b64d05ea7 (diff)
downloadkolla-a459a29433d6fb274843ce43dd3b5719bf419c5d.tar.gz
kolla-a459a29433d6fb274843ce43dd3b5719bf419c5d.zip
Merge "Improve task names for Ceph"
-rw-r--r--ansible/roles/ceph/tasks/bootstrap_osds.yml8
-rw-r--r--ansible/roles/ceph/tasks/start_osds.yml2
2 files changed, 5 insertions, 5 deletions
diff --git a/ansible/roles/ceph/tasks/bootstrap_osds.yml b/ansible/roles/ceph/tasks/bootstrap_osds.yml
index f5067ae8b..47a9459c8 100644
--- a/ansible/roles/ceph/tasks/bootstrap_osds.yml
+++ b/ansible/roles/ceph/tasks/bootstrap_osds.yml
@@ -1,5 +1,5 @@
---
-- name: Looking up disks to bootstrap for Ceph
+- name: Looking up disks to bootstrap for Ceph OSDs
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m find_disks
-a "partition_name='KOLLA_CEPH_OSD_BOOTSTRAP' match_mode='prefix'"
@@ -7,11 +7,11 @@
changed_when: "{{ osd_lookup.stdout.find('localhost | SUCCESS => ') != -1 and (osd_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
failed_when: osd_lookup.stdout.split()[2] != 'SUCCESS'
-- name: Reading data from variable
+- name: Parsing disk info for Ceph OSDs
set_fact:
osds_bootstrap: "{{ (osd_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).disks|from_json }}"
-- name: Looking up disks to bootstrap for Ceph
+- name: Looking up disks to bootstrap for Ceph Cache OSDs
command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-m find_disks
-a "partition_name='KOLLA_CEPH_OSD_CACHE_BOOTSTRAP' match_mode='prefix'"
@@ -19,7 +19,7 @@
changed_when: "{{ osd_cache_lookup.stdout.find('localhost | SUCCESS => ') != -1 and (osd_cache_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
failed_when: osd_cache_lookup.stdout.split()[2] != 'SUCCESS'
-- name: Reading data from variable
+- name: Parsing disk info for Ceph Cache OSDs
set_fact:
osds_cache_bootstrap: "{{ (osd_cache_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).disks|from_json }}"
diff --git a/ansible/roles/ceph/tasks/start_osds.yml b/ansible/roles/ceph/tasks/start_osds.yml
index 96080775a..0f4a9a76e 100644
--- a/ansible/roles/ceph/tasks/start_osds.yml
+++ b/ansible/roles/ceph/tasks/start_osds.yml
@@ -7,7 +7,7 @@
changed_when: "{{ osd_lookup.stdout.find('localhost | SUCCESS => ') != -1 and (osd_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
failed_when: osd_lookup.stdout.split()[2] != 'SUCCESS'
-- name: Reading data from variable
+- name: Parsing disk info for Ceph OSDs
set_fact:
osds: "{{ (osd_lookup.stdout.split('localhost | SUCCESS => ')[1]|from_json).disks|from_json }}"