docker-compose: Populate "real" testnodes

... if we're using them, that is.

Signed-off-by: Zack Cerza <zack@redhat.com>

diff --git a/docs/docker-compose/docker-compose.yml b/docs/docker-compose/docker-compose.yml
index c7cd85f7f0bc483262dd451206620581f37277e1..70866ecd1b302b3db25d113b3171eeffdae27b65 100644 (file)
--- a/docs/docker-compose/docker-compose.yml
+++ b/docs/docker-compose/docker-compose.yml
@@ -68,6 +68,8 @@ services:
         - beanstalk
     environment:
       SSH_PRIVKEY:
+      MACHINE_TYPE:
+      TESTNODES:
   testnode:
     build:
       context: .

diff --git a/docs/docker-compose/teuthology.sh b/docs/docker-compose/teuthology.sh
index ea4e0a2cd88d3fea3362e44d65553bdeb0944724..ff2250ac06c549e8b81ed48a65f45a35964d57df 100755 (executable)
--- a/docs/docker-compose/teuthology.sh
+++ b/docs/docker-compose/teuthology.sh
@@ -4,11 +4,17 @@ set -e
 echo "$SSH_PRIVKEY" > $HOME/.ssh/id_ed25519
 source /teuthology/virtualenv/bin/activate
 set -x
+if [ -n "$TESTNODES" ]; then
+    for node in $(echo $TESTNODES | tr , ' '); do
+        teuthology-update-inventory $node
+    done
+fi
+export MACHINE_TYPE=${MACHINE_TYPE:-testnode}
 teuthology-suite -v \
     --ceph-repo https://github.com/ceph/ceph.git \
     --suite-repo https://github.com/ceph/ceph.git \
     -c master \
-    -m testnode \
+    -m $MACHINE_TYPE \
     --limit 1 \
     -n 100 \
     --suite teuthology:no-ceph \
@@ -22,5 +28,5 @@ teuthology-suite -v \
     /teuthology/custom_conf.yaml
 teuthology-dispatcher -v \
     --log-dir /teuthology/log \
-    --tube testnode \
+    --tube $MACHINE_TYPE \
     --exit-on-empty-queue
\ No newline at end of file