From e8ede11d04f04f794d5817993645b84701c3f926 Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Wed, 6 Mar 2024 11:11:51 -0500 Subject: [PATCH] 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}}` 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 --- qa/suites/orch/cephadm/mgr-nfs-upgrade/2-nfs.yaml | 4 ++-- qa/suites/orch/cephadm/mgr-nfs-upgrade/4-final.yaml | 2 +- .../smoke-roleless/2-services/nfs-haproxy-proto.yaml | 2 +- .../smoke-roleless/2-services/nfs-ingress-rgw-bucket.yaml | 6 +++--- .../smoke-roleless/2-services/nfs-ingress-rgw-user.yaml | 6 +++--- .../orch/cephadm/smoke-roleless/2-services/nfs-ingress.yaml | 2 +- .../cephadm/smoke-roleless/2-services/nfs-ingress2.yaml | 4 ++-- .../smoke-roleless/2-services/nfs-keepalive-only.yaml | 2 +- qa/suites/orch/cephadm/smoke-roleless/2-services/nfs.yaml | 2 +- qa/suites/orch/cephadm/smoke-roleless/2-services/nfs2.yaml | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/2-nfs.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/2-nfs.yaml index 34680fc8a6b..49ca19e2d6f 100644 --- a/qa/suites/orch/cephadm/mgr-nfs-upgrade/2-nfs.yaml +++ b/qa/suites/orch/cephadm/mgr-nfs-upgrade/2-nfs.yaml @@ -1,7 +1,7 @@ tasks: # stop kernel nfs server, if running -- vip.exec: +- exec: all-hosts: - systemctl stop nfs-server @@ -20,7 +20,7 @@ tasks: # we can't do wait_for_service here because with octopus it's nfs.ganesha-foo not nfs.foo - while ! ceph orch ls | grep nfs | grep 2/2 ; do sleep 1 ; done -- vip.exec: +- exec: host.a: - mkdir /mnt/foo - while ! mount -t nfs $(hostname):/fake /mnt/foo -o sync ; do sleep 5 ; done diff --git a/qa/suites/orch/cephadm/mgr-nfs-upgrade/4-final.yaml b/qa/suites/orch/cephadm/mgr-nfs-upgrade/4-final.yaml index c48b61198d7..6785c57e77f 100644 --- a/qa/suites/orch/cephadm/mgr-nfs-upgrade/4-final.yaml +++ b/qa/suites/orch/cephadm/mgr-nfs-upgrade/4-final.yaml @@ -3,7 +3,7 @@ overrides: log-ignorelist: - CEPHADM_REFRESH_FAILED tasks: -- vip.exec: +- exec: host.a: - umount /mnt/foo - cephadm.shell: diff --git a/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-haproxy-proto.yaml b/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-haproxy-proto.yaml index 477e5c44395..e055869a802 100644 --- a/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-haproxy-proto.yaml +++ b/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-haproxy-proto.yaml @@ -7,7 +7,7 @@ tasks: - ceph orch device ls --refresh # stop kernel nfs server, if running -- vip.exec: +- exec: all-hosts: - systemctl stop nfs-server diff --git a/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress-rgw-bucket.yaml b/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress-rgw-bucket.yaml index 3f4964978d9..1fe40f95082 100644 --- a/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress-rgw-bucket.yaml +++ b/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress-rgw-bucket.yaml @@ -7,7 +7,7 @@ tasks: - ceph orch device ls --refresh # stop kernel nfs server, if running -- vip.exec: +- exec: all-hosts: - systemctl stop nfs-server @@ -16,7 +16,7 @@ tasks: - ceph orch apply rgw foorgw --port 8800 - ceph nfs cluster create foo --ingress --virtual-ip {{VIP0}}/{{VIPPREFIXLEN}} -- vip.exec: +- exec: host.a: - dnf install -y python3-boto3 || apt install -y python3-boto3 - /home/ubuntu/cephtest/cephadm shell radosgw-admin user create --uid foouser --display-name foo > /tmp/user.json @@ -79,7 +79,7 @@ tasks: print(data.getvalue()) assert data.getvalue().decode() == 'test\n' -- vip.exec: +- exec: host.a: - umount /mnt/foo diff --git a/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress-rgw-user.yaml b/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress-rgw-user.yaml index 721aecfc34e..b11c14dc695 100644 --- a/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress-rgw-user.yaml +++ b/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress-rgw-user.yaml @@ -7,7 +7,7 @@ tasks: - ceph orch device ls --refresh # stop kernel nfs server, if running -- vip.exec: +- exec: all-hosts: - systemctl stop nfs-server @@ -16,7 +16,7 @@ tasks: - ceph orch apply rgw foorgw --port 8800 - ceph nfs cluster create foo --ingress --virtual-ip {{VIP0}}/{{VIPPREFIXLEN}} -- vip.exec: +- exec: host.a: - dnf install -y python3-boto3 || apt install -y python3-boto3 - /home/ubuntu/cephtest/cephadm shell radosgw-admin user create --uid foouser --display-name foo > /tmp/user.json @@ -80,7 +80,7 @@ tasks: print(data.getvalue()) assert data.getvalue().decode() == 'test\n' -- vip.exec: +- exec: host.a: - umount /mnt/foo diff --git a/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress.yaml b/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress.yaml index b4e843df261..307c44c1ed9 100644 --- a/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress.yaml +++ b/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress.yaml @@ -7,7 +7,7 @@ tasks: - ceph orch device ls --refresh # stop kernel nfs server, if running -- vip.exec: +- exec: all-hosts: - systemctl stop nfs-server diff --git a/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress2.yaml b/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress2.yaml index a47dd9d7646..fa1272c3c5f 100644 --- a/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress2.yaml +++ b/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-ingress2.yaml @@ -7,7 +7,7 @@ tasks: - ceph orch device ls --refresh # stop kernel nfs server, if running -- vip.exec: +- exec: all-hosts: - systemctl stop nfs-server @@ -51,7 +51,7 @@ tasks: # take each ganesha down in turn. # simulate "failure" by deleting the container -- vip.exec: +- exec: all-hosts: - | echo "Check with $(hostname) ganesha(s) down..." diff --git a/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-keepalive-only.yaml b/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-keepalive-only.yaml index ba5afed473b..d3a37f70e10 100644 --- a/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-keepalive-only.yaml +++ b/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs-keepalive-only.yaml @@ -7,7 +7,7 @@ tasks: - ceph orch device ls --refresh # stop kernel nfs server, if running -- vip.exec: +- exec: all-hosts: - systemctl stop nfs-server diff --git a/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs.yaml b/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs.yaml index 194f4e9de11..cffa305758b 100644 --- a/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs.yaml +++ b/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs.yaml @@ -1,7 +1,7 @@ tasks: # stop kernel nfs server, if running -- vip.exec: +- exec: all-hosts: - systemctl stop nfs-server diff --git a/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs2.yaml b/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs2.yaml index 959c5aa77d8..5e71f3bf0a9 100644 --- a/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs2.yaml +++ b/qa/suites/orch/cephadm/smoke-roleless/2-services/nfs2.yaml @@ -1,7 +1,7 @@ tasks: # stop kernel nfs server, if running -- vip.exec: +- exec: all-hosts: - systemctl stop nfs-server -- 2.39.5