Merge pull request #8182 from trociny/wip-rbd-mirror-args

rbd-mirror: make remote context respect env and argv config params

Conflicts:
	qa/workunits/rbd/rbd_mirror.sh (asok command format changed)

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
Reviewed-by: Jason Dillaman <dillaman@redhat.com>

diff --cc qa/workunits/rbd/rbd_mirror.sh
index 901a308c065d0411862bd9f3446a8bee05cf3db5,93b7398d3ff46846be1242a3b2d4b9599d912b29..e037cc12d91d6001a41b78fd63b7d6cc9013fab9
--- 1/qa/workunits/rbd/rbd_mirror.sh
--- 2/qa/workunits/rbd/rbd_mirror.sh
+++ b/qa/workunits/rbd/rbd_mirror.sh
@@@ -156,10 -158,15 +158,10 @@@ flush(
      local image=$1
      local image_id cmd
  
-     test -n "${RBD_MIRROR_ASOK}"
+     test -n "${RBD_MIRROR_LOC_ASOK}"
  
-     ceph --admin-daemon ${TEMPDIR}/rbd-mirror.asok \
 -    image_id=$(remote_image_id ${image})
 -    test -n "${image_id}"
 -
 -    cmd=$(ceph --admin-daemon ${RBD_MIRROR_LOC_ASOK} help |
 -               sed -nEe 's/^.*"(rbd mirror flush.*'${image_id}'])":.*$/\1/p')
 -    test -n "${cmd}"
 -    ceph --admin-daemon ${RBD_MIRROR_LOC_ASOK} ${cmd}
++    ceph --admin-daemon ${RBD_MIRROR_LOC_ASOK} \
 +       rbd mirror flush ${POOL}/${image}
  }
  
  test_image_replay_state()
@@@ -168,10 -175,10 +170,10 @@@
      local test_state=$2
      local current_state=stopped
  
-     test -n "${RBD_MIRROR_ASOK}"
+     test -n "${RBD_MIRROR_LOC_ASOK}"
  
-     ceph --admin-daemon ${RBD_MIRROR_ASOK} help |
 -    ceph --admin-daemon ${RBD_MIRROR_LOC_ASOK} help | fgrep "${image_id}" &&
 -      current_state=started
++    ceph --admin-daemon ${RBD_MIRROR_LOC_ASOK} help |
 +      fgrep "rbd mirror status ${POOL}/${image}" && current_state=started
      test "${test_state}" = "${current_state}"
  }