From 2d46185c209aa8910d75e75fb56b47e110f0e55e Mon Sep 17 00:00:00 2001 From: Michael Fritch Date: Tue, 25 Feb 2020 14:13:37 -0700 Subject: [PATCH] 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 --- qa/workunits/cephadm/test_cephadm.sh | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/qa/workunits/cephadm/test_cephadm.sh b/qa/workunits/cephadm/test_cephadm.sh index 08529cafc1a..ec8c330a07d 100755 --- 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 -- 2.39.5