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 <jmulligan@redhat.com>

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 34680fc8a6b9114b32c5bc2108080f549fd68615..49ca19e2d6fb64e057126064c73b60994c894659 100644 (file)
--- 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 c48b61198d7a0e45a62228d047535ceeda109164..6785c57e77f2f38e7666940be0845e67dcb6623e 100644 (file)
--- 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 477e5c44395543f7fdd6096f7906f0e33e835597..e055869a802bfa0543c57cf4745df509c49c9ab8 100644 (file)
--- 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 3f4964978d929f479cab6f029cfddc9d6c6ff3de..1fe40f950825eb2da9a05044ad52c01a2883c078 100644 (file)
--- 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 721aecfc34e5748cb679297bb890cd5cd7353da8..b11c14dc69582e28ef1eb345e62df9f59ef44674 100644 (file)
--- 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 b4e843df2611623ed7a13e52abb6a9f4e79fa703..307c44c1ed97aa5ca151ae65b6540a458e9198d6 100644 (file)
--- 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 a47dd9d7646bd54775d713b916381c425c30971f..fa1272c3c5fccb98baa02c522a9bab436cf4f16c 100644 (file)
--- 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 ba5afed473b6f522e704a788b08dcbfeb0164f6f..d3a37f70e10191a9de94e148bd6d14ba73e05a34 100644 (file)
--- 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 194f4e9de11806d1c697776328a35a60d1d8e98d..cffa305758bfc1065448c40b1a11c1719d71a1e4 100644 (file)
--- 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 959c5aa77d85391872ee1a6f4fe52be064a946b2..5e71f3bf0a91cb52bca07cbd5b192a40279f740b 100644 (file)
--- 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