Skip to content

Commit b45fe1b

Browse files
phlogistonjohnphlogistonjohn
committed
qa/tasks: replace cephadm.exec with template.exec
Signed-off-by: John Mulligan <[email protected]>
1 parent 550ce35 commit b45fe1b

15 files changed

+28
-28
lines changed

‎qa/suites/orch/cephadm/smb/tasks/deploy_smb_basic.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ tasks:
7878
- "client.smbdata"
7979
- cephadm.wait_for_service:
8080
service: smb.saserv1
81-
- cephadm.exec:
81+
- template.exec:
8282
host.b:
8383
- sleep 30
8484
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U smbuser1%insecure321 //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls"

‎qa/suites/orch/cephadm/smb/tasks/deploy_smb_ctdb_node_gone_state.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ tasks:
5454
service: smb.modusr1
5555

5656
# verify CTDB is healthy, cluster well formed
57-
- cephadm.exec:
57+
- template.exec:
5858
host.a:
5959
- sleep 30
6060
- "{{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:
8282
service: smb.modusr1
8383

8484
# verify CTDB status doesn't include the node that was removed
85-
- cephadm.exec:
85+
- template.exec:
8686
host.a:
8787
- "{{ctx.cephadm}} ls --no-detail | {{ctx.cephadm}} shell jq -r 'map(select(.name | startswith(\"smb.modusr1\")))[-1].name' > /tmp/svcname"
8888
- "{{ctx.cephadm}} enter -n $(cat /tmp/svcname) ctdb listnodes > /tmp/ctdb_listnodes"

‎qa/suites/orch/cephadm/smb/tasks/deploy_smb_domain.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ tasks:
8989
- cephadm.wait_for_service:
9090
service: smb.admem1
9191

92-
- cephadm.exec:
92+
- template.exec:
9393
host.b:
9494
- sleep 30
9595
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls"

‎qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_basic.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ tasks:
4646
- cephadm.wait_for_service:
4747
service: smb.modusr1
4848
# Check if shares exist
49-
- cephadm.exec:
49+
- template.exec:
5050
host.b:
5151
- sleep 30
5252
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U user1%t3stP4ss1 //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls"

‎qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_clustering_ips.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,14 +59,14 @@ tasks:
5959
service: smb.modusr1
6060

6161
# Check if shares exist
62-
- cephadm.exec:
62+
- template.exec:
6363
host.d:
6464
- sleep 30
6565
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U user1%t3stP4ss1 //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls"
6666
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U user1%t3stP4ss1 //{{'host.a'|role_to_remote|attr('ip_address')}}/share2 -c ls"
6767

6868
# verify CTDB is healthy, cluster well formed
69-
- cephadm.exec:
69+
- template.exec:
7070
host.a:
7171
- "{{ctx.cephadm}} ls --no-detail | {{ctx.cephadm}} shell jq -r 'map(select(.name | startswith(\"smb.modusr1\")))[-1].name' > /tmp/svcname"
7272
- "{{ctx.cephadm}} enter -n $(cat /tmp/svcname) ctdb status > /tmp/ctdb_status"
@@ -78,7 +78,7 @@ tasks:
7878
- rm -rf /tmp/svcname /tmp/ctdb_status
7979

8080
# Test the assigned VIP
81-
- cephadm.exec:
81+
- template.exec:
8282
host.d:
8383
- sleep 30
8484
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U user1%t3stP4ss1 //{{VIP0}}/share1 -c ls"

‎qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_basic.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,14 +88,14 @@ tasks:
8888
- cmd: rados --pool=.smb -N uctdb1 get cluster.meta.json /dev/stdout
8989

9090
# Check if shares exist
91-
- cephadm.exec:
91+
- template.exec:
9292
host.d:
9393
- sleep 30
9494
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U user1%t3stP4ss1 //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls"
9595
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U user2%t3stP4ss2 //{{'host.a'|role_to_remote|attr('ip_address')}}/share2 -c ls"
9696

9797
# verify CTDB is healthy, cluster well formed
98-
- cephadm.exec:
98+
- template.exec:
9999
host.a:
100100
- "{{ctx.cephadm}} ls --no-detail | {{ctx.cephadm}} shell jq -r 'map(select(.name | startswith(\"smb.uctdb1\")))[-1].name' > /tmp/svcname"
101101
- "{{ctx.cephadm}} enter -n $(cat /tmp/svcname) ctdb status > /tmp/ctdb_status"
@@ -107,7 +107,7 @@ tasks:
107107
- rm -rf /tmp/svcname /tmp/ctdb_status
108108

109109
# Test a different host in the cluster
110-
- cephadm.exec:
110+
- template.exec:
111111
host.d:
112112
- sleep 30
113113
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U user1%t3stP4ss1 //{{'host.c'|role_to_remote|attr('ip_address')}}/share1 -c ls"

‎qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_dom.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,14 @@ tasks:
9191
- cmd: rados --pool=.smb -N adctdb1 get cluster.meta.json /dev/stdout
9292

9393
# Check if shares exist
94-
- cephadm.exec:
94+
- template.exec:
9595
host.d:
9696
- sleep 30
9797
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls"
9898
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share2 -c ls"
9999

100100
# verify CTDB is healthy, cluster well formed
101-
- cephadm.exec:
101+
- template.exec:
102102
host.a:
103103
- "{{ctx.cephadm}} ls --no-detail | {{ctx.cephadm}} shell jq -r 'map(select(.name | startswith(\"smb.adctdb1\")))[-1].name' > /tmp/svcname"
104104
- "{{ctx.cephadm}} enter -n $(cat /tmp/svcname) ctdb status > /tmp/ctdb_status"
@@ -110,7 +110,7 @@ tasks:
110110
- rm -rf /tmp/svcname /tmp/ctdb_status
111111

112112
# Test a different host in the cluster
113-
- cephadm.exec:
113+
- template.exec:
114114
host.d:
115115
- sleep 30
116116
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.c'|role_to_remote|attr('ip_address')}}/share1 -c ls"

‎qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_ips.yaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,14 @@ tasks:
9696
- cmd: rados --pool=.smb -N adipctdb get cluster.meta.json /dev/stdout
9797

9898
# Check if shares exist
99-
- cephadm.exec:
99+
- template.exec:
100100
host.d:
101101
- sleep 30
102102
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls"
103103
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share2 -c ls"
104104

105105
# verify CTDB is healthy, cluster well formed
106-
- cephadm.exec:
106+
- template.exec:
107107
host.a:
108108
- "{{ctx.cephadm}} ls --no-detail | {{ctx.cephadm}} shell jq -r 'map(select(.name | startswith(\"smb.adipctdb\")))[-1].name' > /tmp/svcname"
109109
- "{{ctx.cephadm}} enter -n $(cat /tmp/svcname) ctdb status > /tmp/ctdb_status"
@@ -115,7 +115,7 @@ tasks:
115115
- rm -rf /tmp/svcname /tmp/ctdb_status
116116

117117
# Test the two assigned VIPs
118-
- cephadm.exec:
118+
- template.exec:
119119
host.d:
120120
- sleep 30
121121
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{VIP0}}/share1 -c ls"

‎qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_ctdb_res_ports2c.yaml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,15 +129,15 @@ tasks:
129129
- cmd: rados --pool=.smb -N ac2 get cluster.meta.json /dev/stdout
130130

131131
# Check if shares exist
132-
- cephadm.exec:
132+
- template.exec:
133133
host.d:
134134
- sleep 30
135135
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls"
136136
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share2 -c ls"
137137
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -p4455 -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/s1ac2 -c ls"
138138

139139
# verify CTDB is healthy, cluster 1 is well formed
140-
- cephadm.exec:
140+
- template.exec:
141141
host.a:
142142
- "{{ctx.cephadm}} ls --no-detail | {{ctx.cephadm}} shell jq -r 'map(select(.name | startswith(\"smb.ac1\")))[-1].name' > /tmp/svcname"
143143
- "{{ctx.cephadm}} enter -n $(cat /tmp/svcname) ctdb status > /tmp/ctdb_status"
@@ -148,7 +148,7 @@ tasks:
148148
- grep 'Number of nodes:3' /tmp/ctdb_status
149149
- rm -rf /tmp/svcname /tmp/ctdb_status
150150
# verify CTDB is healthy, cluster 2 is well formed
151-
- cephadm.exec:
151+
- template.exec:
152152
host.a:
153153
- "{{ctx.cephadm}} ls --no-detail | {{ctx.cephadm}} shell jq -r 'map(select(.name | startswith(\"smb.ac2\")))[-1].name' > /tmp/svcname"
154154
- "{{ctx.cephadm}} enter -n $(cat /tmp/svcname) ctdb status > /tmp/ctdb_status"
@@ -160,15 +160,15 @@ tasks:
160160
- rm -rf /tmp/svcname /tmp/ctdb_status
161161

162162
# Test the two assigned VIPs on cluster 1
163-
- cephadm.exec:
163+
- template.exec:
164164
host.d:
165165
- sleep 30
166166
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{VIP0}}/share1 -c ls"
167167
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{VIP1}}/share1 -c ls"
168168
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{VIP0}}/share2 -c ls"
169169
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{VIP1}}/share2 -c ls"
170170
# Test the assigned VIP on cluster 2
171-
- cephadm.exec:
171+
- template.exec:
172172
host.d:
173173
- sleep 30
174174
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -p4455 -U DOMAIN1\\\\ckent%1115Rose. //{{VIP2}}/s1ac2 -c ls"

‎qa/suites/orch/cephadm/smb/tasks/deploy_smb_mgr_domain.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ tasks:
4747
- cephadm.wait_for_service:
4848
service: smb.modtest1
4949
# Check if shares exist
50-
- cephadm.exec:
50+
- template.exec:
5151
host.b:
5252
- sleep 30
5353
- "{{ctx.samba_client_container_cmd|join(' ')}} smbclient -U DOMAIN1\\\\ckent%1115Rose. //{{'host.a'|role_to_remote|attr('ip_address')}}/share1 -c ls"

0 commit comments

Comments
 (0)