diff --git a/srv/salt/ceph/functests/1node/replace/delay.sls b/srv/salt/ceph/functests/1node/replace/delay.sls index 0ce7957a5..64d03fd04 100644 --- a/srv/salt/ceph/functests/1node/replace/delay.sls +++ b/srv/salt/ceph/functests/1node/replace/delay.sls @@ -4,6 +4,7 @@ Disengage {{ label }}: salt.runner: - name: disengage.safety + - failhard: True keyword arguments: salt.runner: @@ -13,20 +14,24 @@ keyword arguments: - kwarg: delay: 1 timeout: 1 + - failhard: True Check OSDs {{ label }}: salt.state: - tgt: {{ salt['master.minion']() }} - sls: ceph.tests.replace.check_0 + - failhard: True Restore OSDs {{ label }}: salt.state: - tgt: I@roles:storage - sls: ceph.tests.replace.restore_osds - tgt_type: compound + - failhard: True Wait for Ceph {{ label }}: salt.state: - tgt: {{ salt['master.minion']() }} - sls: ceph.wait.until.OK + - failhard: True diff --git a/srv/salt/ceph/functests/1node/replace/force.sls b/srv/salt/ceph/functests/1node/replace/force.sls index 106947a9a..9dbf2a71e 100644 --- a/srv/salt/ceph/functests/1node/replace/force.sls +++ b/srv/salt/ceph/functests/1node/replace/force.sls @@ -4,6 +4,7 @@ Disengage {{ label }}: salt.runner: - name: disengage.safety + - failhard: True forced removal: salt.runner: @@ -12,20 +13,24 @@ forced removal: - 0 - kwarg: force: True + - failhard: True Check OSDs {{ label }}: salt.state: - tgt: {{ salt['master.minion']() }} - sls: ceph.tests.replace.check_0 + - failhard: True Restore OSDs {{ label }}: salt.state: - tgt: I@roles:storage - sls: ceph.tests.replace.restore_osds - tgt_type: compound + - failhard: True Wait for Ceph {{ label }}: salt.state: - tgt: {{ salt['master.minion']() }} - sls: ceph.wait.until.OK + - failhard: True diff --git a/srv/salt/ceph/functests/1node/replace/multiple.sls b/srv/salt/ceph/functests/1node/replace/multiple.sls index acfba2891..ed3479418 100644 --- a/srv/salt/ceph/functests/1node/replace/multiple.sls +++ b/srv/salt/ceph/functests/1node/replace/multiple.sls @@ -4,6 +4,7 @@ Disengage {{ label }}: salt.runner: - name: disengage.safety + - failhard: True Multiple arguments: salt.runner: @@ -11,20 +12,24 @@ Multiple arguments: - arg: - 0 - 1 + - failhard: True Check OSDs {{ label }}: salt.state: - tgt: {{ salt['master.minion']() }} - sls: ceph.tests.replace.check_absent + - failhard: True Restore OSDs {{ label }}: salt.state: - tgt: 'I@roles:storage' - sls: ceph.tests.replace.restore_osds - tgt_type: compound + - failhard: True Wait for Ceph {{ label }}: salt.state: - tgt: {{ salt['master.minion']() }} - sls: ceph.wait.until.OK + - failhard: True