Adding upstream version 18.2.3.upstream/18.2.3upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

3 files changed, 15 insertions, 15 deletions

diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test.yml
index 5d5bc59f2..17f200c9d 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test.yml
@@ -14,10 +14,10 @@
   tasks:
 
     - name: mark osds down
-      command: "ceph --cluster {{ cluster }} osd down osd.{{ item }}"
+      command: "ceph osd down osd.{{ item }}"
       with_items: "{{ osd_ids }}"
     - name: purge osds
-      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
+      command: "ceph osd purge osd.{{ item }} --yes-i-really-mean-it"
       with_items: "{{ osd_ids }}"
 
 - hosts: osds
@@ -25,18 +25,18 @@
   tasks:
 
     - name: zap devices used for OSDs
-      command: "ceph-volume --cluster {{ cluster }} lvm zap {{ item }} --destroy"
+      command: "ceph-volume lvm zap {{ item }} --destroy"
       with_items: "{{ devices }}"
       environment:
         CEPH_VOLUME_DEBUG: 1
 
     - name: batch create devices again
-      command: "ceph-volume --cluster {{ cluster }} lvm batch --yes --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices | join(' ') }}"
+      command: "ceph-volume lvm batch --yes --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices | join(' ') }}"
       environment:
         CEPH_VOLUME_DEBUG: 1
 
     - name: ensure batch create is idempotent
-      command: "ceph-volume --cluster {{ cluster }} lvm batch --yes --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices | join(' ') }}"
+      command: "ceph-volume lvm batch --yes --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices | join(' ') }}"
       register: batch_cmd
       failed_when: false
       environment:
@@ -50,7 +50,7 @@
          - "'strategy changed' not in batch_cmd.stderr"
 
     - name: run batch --report to see if devices get filtered
-      command: "ceph-volume --cluster {{ cluster }} lvm batch --report --format=json --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices | join(' ') }}"
+      command: "ceph-volume lvm batch --report --format=json --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices | join(' ') }}"
       register: report_cmd
       failed_when: false
       environment:
diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_explicit.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_explicit.yml
index 1ff0acc9d..2581f5c46 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_explicit.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_explicit.yml
@@ -14,10 +14,10 @@
   tasks:
 
     - name: mark osds down
-      command: "ceph --cluster {{ cluster }} osd down osd.{{ item }}"
+      command: "ceph osd down osd.{{ item }}"
       with_items: "{{ osd_ids }}"
     - name: purge osds
-      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
+      command: "ceph osd purge osd.{{ item }} --yes-i-really-mean-it"
       with_items: "{{ osd_ids }}"
 
 - hosts: osds
@@ -27,18 +27,18 @@
   tasks:
 
     - name: zap devices used for OSDs
-      command: "ceph-volume --cluster {{ cluster }} lvm zap {{ item }} --destroy"
+      command: "ceph-volume lvm zap {{ item }} --destroy"
       with_items: "{{ devices }}"
       environment:
         CEPH_VOLUME_DEBUG: 1
 
     - name: batch create devices again
-      command: "ceph-volume --cluster {{ cluster }} lvm batch --yes --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices[:2] | join(' ') }} {{ external_devices }} {{ devices[2:] | join(' ') }}"
+      command: "ceph-volume lvm batch --yes --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices[:2] | join(' ') }} {{ external_devices }} {{ devices[2:] | join(' ') }}"
       environment:
         CEPH_VOLUME_DEBUG: 1
 
     - name: ensure batch create is idempotent when all data devices are filtered
-      command: "ceph-volume --cluster {{ cluster }} lvm batch --yes --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices[:2] | join(' ') }} {{ external_devices }} {{ devices[2:] | join(' ') }}"
+      command: "ceph-volume lvm batch --yes --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices[:2] | join(' ') }} {{ external_devices }} {{ devices[2:] | join(' ') }}"
       register: batch_cmd
       failed_when: false
       environment:
@@ -51,7 +51,7 @@
          - batch_cmd.rc != 0
 
     - name: run batch --report to see if devices get filtered
-      command: "ceph-volume --cluster {{ cluster }} lvm batch --report --format=json --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices[:2] | join(' ') }} {{ external_devices }} {{ devices[2:] | join(' ') }}"
+      command: "ceph-volume lvm batch --report --format=json --{{ osd_objectstore|default('bluestore') }} {{ '--dmcrypt' if dmcrypt|default(false) else '' }} {{ devices[:2] | join(' ') }} {{ external_devices }} {{ devices[2:] | join(' ') }}"
       register: report_cmd
       failed_when: false
       environment:
diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_zap.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_zap.yml
index 9d63df9e0..4408288c8 100644
--- a/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_zap.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/batch/playbooks/test_zap.yml
@@ -15,10 +15,10 @@
   tasks:
 
     - name: mark osds down
-      command: "ceph --cluster {{ cluster }} osd down osd.{{ item }}"
+      command: "ceph osd down osd.{{ item }}"
       with_items: "{{ osd_ids }}"
     - name: purge osds
-      command: "ceph --cluster {{ cluster }} osd purge osd.{{ item }} --yes-i-really-mean-it"
+      command: "ceph osd purge osd.{{ item }} --yes-i-really-mean-it"
       with_items: "{{ osd_ids }}"
 
 
@@ -27,7 +27,7 @@
   tasks:
 
     - name: zap devices used for OSDs
-      command: "ceph-volume --cluster {{ cluster }} lvm zap --osd-id {{ item }} --destroy"
+      command: "ceph-volume lvm zap --osd-id {{ item }} --destroy"
       with_items: "{{ osd_ids }}"
       environment:
         CEPH_VOLUME_DEBUG: 1