qa/workunits/cephadm/test_cephadm.sh: remove image param non-ceph tests

non-ceph components have a default image
as of 97def7cb60de8c52db1cfca198bd2cd64585883f

Signed-off-by: Michael Fritch <mfritch@suse.com>

diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh
index 08529cafc1ad1006c4c3ff74e4939444b8174bc9..ec8c330a07d8fb06af977733a1b5524e4047c6fa 100755 (executable)
--- a/qa/workunits/cephadm/test_cephadm.sh
+++ b/qa/workunits/cephadm/test_cephadm.sh
@@ -226,24 +226,22 @@ for id in `seq 0 $((--OSD_TO_CREATE))`; do
 done
 
 # add node-exporter
-$CEPHADM --image 'prom/node-exporter:latest' \
-        deploy --name node-exporter.a --fsid $FSID
+${CEPHADM//--image $IMAGE_MASTER/} deploy \
+    --name node-exporter.a --fsid $FSID
 cond="curl 'http://localhost:9100' | grep -q 'Node Exporter'"
 is_available "node-exporter" "$cond" 5
 
 # add prometheus
 cat ${CEPHADM_SAMPLES_DIR}/prometheus.json | \
-        $CEPHADM --image 'prom/prometheus:latest' \
-            deploy --name prometheus.a --fsid $FSID \
-                   --config-json -
+        ${CEPHADM//--image $IMAGE_MASTER/} deploy \
+           --name prometheus.a --fsid $FSID --config-json -
 cond="curl 'localhost:9095/api/v1/query?query=up'"
 is_available "prometheus" "$cond" 5
 
 # add grafana
 cat ${CEPHADM_SAMPLES_DIR}/grafana.json | \
-        $CEPHADM --image 'pcuzner/ceph-grafana-el8:latest' \
-            deploy --name grafana.a --fsid $FSID \
-                   --config-json -
+        ${CEPHADM//--image $IMAGE_MASTER/} deploy \
+            --name grafana.a --fsid $FSID --config-json -
 cond="curl --insecure 'https://localhost:3000' | grep -q 'grafana'"
 is_available "grafana" "$cond" 30