From: Chengwei Yang <yangchengwei@qiyi.com>
Date: Tue, 26 Jul 2016 00:55:43 +0000 (+0800)
Subject: sgdisk: remove duplicated option `-g`
X-Git-Tag: v1.0.6~46^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F905%2Fhead;p=ceph-ansible.git

sgdisk: remove duplicated option `-g`

Option `-g` of sgdisk is duplicated with `--mbrtogpt`, so lets remove it.

This fix #896

Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
---

diff --git a/roles/ceph-osd/tasks/check_devices.yml b/roles/ceph-osd/tasks/check_devices.yml
index 64a7dbb1c..8bb55f4ec 100644
--- a/roles/ceph-osd/tasks/check_devices.yml
+++ b/roles/ceph-osd/tasks/check_devices.yml
@@ -78,7 +78,7 @@
 # keep the current flow of the task.
 # See: https://github.com/ceph/ceph-ansible/issues/759
 - name: fix partitions gpt header or labels of the osd disks
-  shell: "sgdisk --zap-all --clear --mbrtogpt -g -- {{ item.1 }} || sgdisk --zap-all --clear --mbrtogpt -g -- {{ item.1 }}"
+  shell: "sgdisk --zap-all --clear --mbrtogpt -- {{ item.1 }} || sgdisk --zap-all --clear --mbrtogpt -- {{ item.1 }}"
   with_together:
     - combined_osd_partition_status_results.results
     - devices
@@ -89,7 +89,7 @@
     - item.0.rc != 0
 
 - name: fix partitions gpt header or labels of the osd disks (autodiscover disks)
-  shell: "sgdisk --zap-all --clear --mbrtogpt -g -- '/dev/{{ item.0.item.key }}' || sgdisk --zap-all --clear --mbrtogpt -g -- '/dev/{{ item.0.item.key }}'"
+  shell: "sgdisk --zap-all --clear --mbrtogpt -- '/dev/{{ item.0.item.key }}' || sgdisk --zap-all --clear --mbrtogpt -- '/dev/{{ item.0.item.key }}'"
   with_together:
     - combined_osd_partition_status_results.results
     - ansible_devices
@@ -103,7 +103,7 @@
     - item.0.rc != 0
 
 - name: fix partitions gpt header or labels of the journal devices
-  shell: "sgdisk --zap-all --clear --mbrtogpt -g -- {{ item.1 }} || sgdisk --zap-all --clear --mbrtogpt -g -- {{ item.1 }}"
+  shell: "sgdisk --zap-all --clear --mbrtogpt -- {{ item.1 }} || sgdisk --zap-all --clear --mbrtogpt -- {{ item.1 }}"
   with_together:
     - journal_partition_status.results
     - raw_journal_devices