From b45fe1b760062cfcebd89d59ce319d5a95952fad Mon Sep 17 00:00:00 2001 From: John Mulligan Date: Wed, 6 Mar 2024 11:59:57 -0500 Subject: [PATCH] qa/tasks: replace cephadm.exec with template.exec Signed-off-by: John Mulligan --- qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml | 2 +- .../smb/tasks/deploy_smb_ctdb_node_gone_state.yaml | 4 ++-- .../orch/cephadm/smb/tasks/deploy_smb_domain.yaml | 2 +- .../orch/cephadm/smb/tasks/deploy_smb_mgr_basic.yaml | 2 +- .../smb/tasks/deploy_smb_mgr_clustering_ips.yaml | 6 +++--- .../smb/tasks/deploy_smb_mgr_ctdb_res_basic.yaml | 6 +++--- .../cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_dom.yaml | 6 +++--- .../cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_ips.yaml | 6 +++--- .../smb/tasks/deploy_smb_mgr_ctdb_res_ports2c.yaml | 10 +++++----- .../orch/cephadm/smb/tasks/deploy_smb_mgr_domain.yaml | 2 +- .../cephadm/smb/tasks/deploy_smb_mgr_res_basic.yaml | 2 +- .../orch/cephadm/smb/tasks/deploy_smb_mgr_res_dom.yaml | 2 +- .../cephadm/smb/tasks/deploy_smb_mgr_res_ports.yaml | 2 +- .../cephadm/smb/tasks/deploy_smb_proxy_disabled.yaml | 2 +- .../cephadm/smb/tasks/deploy_smb_proxy_enabled.yaml | 2 +- 15 files changed, 28 insertions(+), 28 deletions(-) diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml index cb5c78d514fd9..eba5025cf35ad 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml @@ -78,7 +78,7 @@ tasks: - "client.smbdata" - cephadm.wait_for_service: service: smb.saserv1 - - cephadm.exec: + - template.exec: host.b: - sleep 30 - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U smbuser1%insecure321 //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls" diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_ctdb_node_gone_state.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_ctdb_node_gone_state.yaml index 6513d9b4bbc43..2a1257e5c95b6 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_ctdb_node_gone_state.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_ctdb_node_gone_state.yaml @@ -54,7 +54,7 @@ tasks: service: smb.modusr1 # verify CTDB is healthy, cluster well formed -- cephadm.exec: +- template.exec: host.a: - sleep 30 - "{{ctx.cephadm}} ls --no-detail | {{ctx.cephadm}} shell jq -r 'map(select(.name | startswith(\"smb.modusr1\")))[-1].name' > /tmp/svcname" @@ -82,7 +82,7 @@ tasks: service: smb.modusr1 # verify CTDB status doesn't include the node that was removed -- cephadm.exec: +- template.exec: host.a: - "{{ctx.cephadm}} ls --no-detail | {{ctx.cephadm}} shell jq -r 'map(select(.name | startswith(\"smb.modusr1\")))[-1].name' > /tmp/svcname" - "{{ctx.cephadm}} enter -n $(cat /tmp/svcname) ctdb listnodes > /tmp/ctdb_listnodes" diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml index 9f93c740a8e7a..86220108c2369 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml @@ -89,7 +89,7 @@ tasks: - cephadm.wait_for_service: service: smb.admem1 -- cephadm.exec: +- template.exec: host.b: - sleep 30 - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls" diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_basic.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_basic.yaml index 18f3ed374ead1..957977c0b6b12 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_basic.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_basic.yaml @@ -46,7 +46,7 @@ tasks: - cephadm.wait_for_service: service: smb.modusr1 # Check if shares exist -- cephadm.exec: +- template.exec: host.b: - sleep 30 - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U user1%t3stP4ss1 //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls" diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_clustering_ips.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_clustering_ips.yaml index 62eebc03d73cc..14e28c89f4e8e 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_clustering_ips.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_clustering_ips.yaml @@ -59,14 +59,14 @@ tasks: service: smb.modusr1 # Check if shares exist -- cephadm.exec: +- template.exec: host.d: - sleep 30 - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U user1%t3stP4ss1 //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls" - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U user1%t3stP4ss1 //{{'host.a'|role_to_remote|attr('ip_address')}}/share2 -c ls" # verify CTDB is healthy, cluster well formed -- cephadm.exec: +- template.exec: host.a: - "{{ctx.cephadm}} ls --no-detail | {{ctx.cephadm}} shell jq -r 'map(select(.name | startswith(\"smb.modusr1\")))[-1].name' > /tmp/svcname" - "{{ctx.cephadm}} enter -n $(cat /tmp/svcname) ctdb status > /tmp/ctdb_status" @@ -78,7 +78,7 @@ tasks: - rm -rf /tmp/svcname /tmp/ctdb_status # Test the assigned VIP -- cephadm.exec: +- template.exec: host.d: - sleep 30 - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U user1%t3stP4ss1 //{{VIP0}}/share1 -c ls" diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_basic.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_basic.yaml index 3ae2002af9ddd..d3a979be5f191 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_basic.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_basic.yaml @@ -88,14 +88,14 @@ tasks: - cmd: rados --pool=.smb -N uctdb1 get cluster.meta.json /dev/stdout # Check if shares exist -- cephadm.exec: +- template.exec: host.d: - sleep 30 - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U user1%t3stP4ss1 //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls" - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U user2%t3stP4ss2 //{{'host.a'|role_to_remote|attr('ip_address')}}/share2 -c ls" # verify CTDB is healthy, cluster well formed -- cephadm.exec: +- template.exec: host.a: - "{{ctx.cephadm}} ls --no-detail | {{ctx.cephadm}} shell jq -r 'map(select(.name | startswith(\"smb.uctdb1\")))[-1].name' > /tmp/svcname" - "{{ctx.cephadm}} enter -n $(cat /tmp/svcname) ctdb status > /tmp/ctdb_status" @@ -107,7 +107,7 @@ tasks: - rm -rf /tmp/svcname /tmp/ctdb_status # Test a different host in the cluster -- cephadm.exec: +- template.exec: host.d: - sleep 30 - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U user1%t3stP4ss1 //{{'host.c'|role_to_remote|attr('ip_address')}}/share1 -c ls" diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_dom.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_dom.yaml index 70f7629833231..bf96de81f2fdc 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_dom.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_dom.yaml @@ -91,14 +91,14 @@ tasks: - cmd: rados --pool=.smb -N adctdb1 get cluster.meta.json /dev/stdout # Check if shares exist -- cephadm.exec: +- template.exec: host.d: - sleep 30 - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls" - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share2 -c ls" # verify CTDB is healthy, cluster well formed -- cephadm.exec: +- template.exec: host.a: - "{{ctx.cephadm}} ls --no-detail | {{ctx.cephadm}} shell jq -r 'map(select(.name | startswith(\"smb.adctdb1\")))[-1].name' > /tmp/svcname" - "{{ctx.cephadm}} enter -n $(cat /tmp/svcname) ctdb status > /tmp/ctdb_status" @@ -110,7 +110,7 @@ tasks: - rm -rf /tmp/svcname /tmp/ctdb_status # Test a different host in the cluster -- cephadm.exec: +- template.exec: host.d: - sleep 30 - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.c'|role_to_remote|attr('ip_address')}}/share1 -c ls" diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_ips.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_ips.yaml index 7221c6a8577ce..f0405e4d14dc7 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_ips.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_ips.yaml @@ -96,14 +96,14 @@ tasks: - cmd: rados --pool=.smb -N adipctdb get cluster.meta.json /dev/stdout # Check if shares exist -- cephadm.exec: +- template.exec: host.d: - sleep 30 - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls" - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share2 -c ls" # verify CTDB is healthy, cluster well formed -- cephadm.exec: +- template.exec: host.a: - "{{ctx.cephadm}} ls --no-detail | {{ctx.cephadm}} shell jq -r 'map(select(.name | startswith(\"smb.adipctdb\")))[-1].name' > /tmp/svcname" - "{{ctx.cephadm}} enter -n $(cat /tmp/svcname) ctdb status > /tmp/ctdb_status" @@ -115,7 +115,7 @@ tasks: - rm -rf /tmp/svcname /tmp/ctdb_status # Test the two assigned VIPs -- cephadm.exec: +- template.exec: host.d: - sleep 30 - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{VIP0}}/share1 -c ls" diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_ports2c.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_ports2c.yaml index eb9b7863c82d6..bbac4357f6fba 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_ports2c.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_ports2c.yaml @@ -129,7 +129,7 @@ tasks: - cmd: rados --pool=.smb -N ac2 get cluster.meta.json /dev/stdout # Check if shares exist -- cephadm.exec: +- template.exec: host.d: - sleep 30 - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls" @@ -137,7 +137,7 @@ tasks: - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -p4455 -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/s1ac2 -c ls" # verify CTDB is healthy, cluster 1 is well formed -- cephadm.exec: +- template.exec: host.a: - "{{ctx.cephadm}} ls --no-detail | {{ctx.cephadm}} shell jq -r 'map(select(.name | startswith(\"smb.ac1\")))[-1].name' > /tmp/svcname" - "{{ctx.cephadm}} enter -n $(cat /tmp/svcname) ctdb status > /tmp/ctdb_status" @@ -148,7 +148,7 @@ tasks: - grep 'Number of nodes:3' /tmp/ctdb_status - rm -rf /tmp/svcname /tmp/ctdb_status # verify CTDB is healthy, cluster 2 is well formed -- cephadm.exec: +- template.exec: host.a: - "{{ctx.cephadm}} ls --no-detail | {{ctx.cephadm}} shell jq -r 'map(select(.name | startswith(\"smb.ac2\")))[-1].name' > /tmp/svcname" - "{{ctx.cephadm}} enter -n $(cat /tmp/svcname) ctdb status > /tmp/ctdb_status" @@ -160,7 +160,7 @@ tasks: - rm -rf /tmp/svcname /tmp/ctdb_status # Test the two assigned VIPs on cluster 1 -- cephadm.exec: +- template.exec: host.d: - sleep 30 - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{VIP0}}/share1 -c ls" @@ -168,7 +168,7 @@ tasks: - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{VIP0}}/share2 -c ls" - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{VIP1}}/share2 -c ls" # Test the assigned VIP on cluster 2 -- cephadm.exec: +- template.exec: host.d: - sleep 30 - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -p4455 -U DOMAIN1\\\\ckent%1115Rose. //{{VIP2}}/s1ac2 -c ls" diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_domain.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_domain.yaml index f07c298c9fce7..ac7ad45c03697 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_domain.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_domain.yaml @@ -47,7 +47,7 @@ tasks: - cephadm.wait_for_service: service: smb.modtest1 # Check if shares exist -- cephadm.exec: +- template.exec: host.b: - sleep 30 - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls" diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_basic.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_basic.yaml index 94bb2f857a86c..735966e876eb1 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_basic.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_basic.yaml @@ -73,7 +73,7 @@ tasks: - cephadm.wait_for_service: service: smb.modusr1 # Check if shares exist -- cephadm.exec: +- template.exec: host.b: - sleep 30 - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U user1%t3stP4ss1 //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls" diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_dom.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_dom.yaml index fd88a30b9eb49..64fd109f66af7 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_dom.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_dom.yaml @@ -76,7 +76,7 @@ tasks: - cephadm.wait_for_service: service: smb.modtest1 # Check if shares exist -- cephadm.exec: +- template.exec: host.b: - sleep 30 - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls" diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_ports.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_ports.yaml index 53823cf78c6e8..542ff0650794c 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_ports.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_res_ports.yaml @@ -79,7 +79,7 @@ tasks: - cephadm.wait_for_service: service: smb.altports # Check if shares exist -- cephadm.exec: +- template.exec: host.b: - sleep 30 - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -p4455 -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls" diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_proxy_disabled.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_proxy_disabled.yaml index 946b2fbc4aad8..a1fd177cf5c3d 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_proxy_disabled.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_proxy_disabled.yaml @@ -78,7 +78,7 @@ tasks: - cephadm.wait_for_service: service: smb.modtest1 # Check if shares exist -- cephadm.exec: +- template.exec: host.b: - sleep 30 - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls" diff --git a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_proxy_enabled.yaml b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_proxy_enabled.yaml index c304818d13509..2f281366a57e5 100644 --- a/qa/suites/orch/cephadm/smb/tasks/deploy_smb_proxy_enabled.yaml +++ b/qa/suites/orch/cephadm/smb/tasks/deploy_smb_proxy_enabled.yaml @@ -78,7 +78,7 @@ tasks: - cephadm.wait_for_service: service: smb.modtest1 # Check if shares exist -- cephadm.exec: +- template.exec: host.b: - sleep 30 - "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls" -- 2.39.5