Skip to content

Commit e8ede11

Browse files
qa/suites: do not use vip.exec when it is not needed
Convert a number of uses of `vip.exec` to basic `exec`. When the replacement pattern `{{VIP<x>}}` is not present vip.exec and exec are essentially the same. This means that the remaining uses of `vip.exec` actually need vip variable substitution. Signed-off-by: John Mulligan <[email protected]>
1 parent 3e427c1 commit e8ede11

File tree

10 files changed

+16
-16
lines changed

10 files changed

+16
-16
lines changed

qa/suites/orch/cephadm/mgr-nfs-upgrade/2-nfs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tasks:
22

33
# stop kernel nfs server, if running
4-
- vip.exec:
4+
- exec:
55
all-hosts:
66
- systemctl stop nfs-server
77

@@ -20,7 +20,7 @@ tasks:
2020
# we can't do wait_for_service here because with octopus it's nfs.ganesha-foo not nfs.foo
2121
- while ! ceph orch ls | grep nfs | grep 2/2 ; do sleep 1 ; done
2222

23-
- vip.exec:
23+
- exec:
2424
host.a:
2525
- mkdir /mnt/foo
2626
- while ! mount -t nfs $(hostname):/fake /mnt/foo -o sync ; do sleep 5 ; done

qa/suites/orch/cephadm/mgr-nfs-upgrade/4-final.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ overrides:
33
log-ignorelist:
44
- CEPHADM_REFRESH_FAILED
55
tasks:
6-
- vip.exec:
6+
- exec:
77
host.a:
88
- umount /mnt/foo
99
- cephadm.shell:

qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-haproxy-proto.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ tasks:
77
- ceph orch device ls --refresh
88

99
# stop kernel nfs server, if running
10-
- vip.exec:
10+
- exec:
1111
all-hosts:
1212
- systemctl stop nfs-server
1313

qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress-rgw-bucket.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ tasks:
77
- ceph orch device ls --refresh
88

99
# stop kernel nfs server, if running
10-
- vip.exec:
10+
- exec:
1111
all-hosts:
1212
- systemctl stop nfs-server
1313

@@ -16,7 +16,7 @@ tasks:
1616
- ceph orch apply rgw foorgw --port 8800
1717
- ceph nfs cluster create foo --ingress --virtual-ip {{VIP0}}/{{VIPPREFIXLEN}}
1818

19-
- vip.exec:
19+
- exec:
2020
host.a:
2121
- dnf install -y python3-boto3 || apt install -y python3-boto3
2222
- /home/ubuntu/cephtest/cephadm shell radosgw-admin user create --uid foouser --display-name foo > /tmp/user.json
@@ -79,7 +79,7 @@ tasks:
7979
print(data.getvalue())
8080
assert data.getvalue().decode() == 'test\n'
8181
82-
- vip.exec:
82+
- exec:
8383
host.a:
8484
- umount /mnt/foo
8585

qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress-rgw-user.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ tasks:
77
- ceph orch device ls --refresh
88

99
# stop kernel nfs server, if running
10-
- vip.exec:
10+
- exec:
1111
all-hosts:
1212
- systemctl stop nfs-server
1313

@@ -16,7 +16,7 @@ tasks:
1616
- ceph orch apply rgw foorgw --port 8800
1717
- ceph nfs cluster create foo --ingress --virtual-ip {{VIP0}}/{{VIPPREFIXLEN}}
1818

19-
- vip.exec:
19+
- exec:
2020
host.a:
2121
- dnf install -y python3-boto3 || apt install -y python3-boto3
2222
- /home/ubuntu/cephtest/cephadm shell radosgw-admin user create --uid foouser --display-name foo > /tmp/user.json
@@ -80,7 +80,7 @@ tasks:
8080
print(data.getvalue())
8181
assert data.getvalue().decode() == 'test\n'
8282
83-
- vip.exec:
83+
- exec:
8484
host.a:
8585
- umount /mnt/foo
8686

qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ tasks:
77
- ceph orch device ls --refresh
88

99
# stop kernel nfs server, if running
10-
- vip.exec:
10+
- exec:
1111
all-hosts:
1212
- systemctl stop nfs-server
1313

qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress2.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ tasks:
77
- ceph orch device ls --refresh
88

99
# stop kernel nfs server, if running
10-
- vip.exec:
10+
- exec:
1111
all-hosts:
1212
- systemctl stop nfs-server
1313

@@ -51,7 +51,7 @@ tasks:
5151
5252
# take each ganesha down in turn.
5353
# simulate "failure" by deleting the container
54-
- vip.exec:
54+
- exec:
5555
all-hosts:
5656
- |
5757
echo "Check with $(hostname) ganesha(s) down..."

qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-keepalive-only.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ tasks:
77
- ceph orch device ls --refresh
88

99
# stop kernel nfs server, if running
10-
- vip.exec:
10+
- exec:
1111
all-hosts:
1212
- systemctl stop nfs-server
1313

qa/suites/orch/cephadm/smoke-roleless/2-services/nfs.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tasks:
22

33
# stop kernel nfs server, if running
4-
- vip.exec:
4+
- exec:
55
all-hosts:
66
- systemctl stop nfs-server
77

qa/suites/orch/cephadm/smoke-roleless/2-services/nfs2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
tasks:
22

33
# stop kernel nfs server, if running
4-
- vip.exec:
4+
- exec:
55
all-hosts:
66
- systemctl stop nfs-server
77

0 commit comments

Comments
 (0)