From 154f06238ce60f542b21811c80366c928b323481 Mon Sep 17 00:00:00 2001
From: Zack Cerza <zack@redhat.com>
Date: Fri, 25 Mar 2022 15:41:33 -0600
Subject: [PATCH] docker-compose: Allow different custom config

When using "real" testnodes, we should not use the custom config we've
been using for containerized nodes. When using "real" testnodes, default
 to not using one, but allow specifying a path in $CUSTOM_CONF.

Signed-off-by: Zack Cerza <zack@redhat.com>
---
 .../{custom_conf.yaml => containerized_node.yaml}          | 0
 docs/docker-compose/start.sh                               | 5 ++++-
 docs/docker-compose/teuthology.sh                          | 7 +++++--
 3 files changed, 9 insertions(+), 3 deletions(-)
 rename docs/docker-compose/{custom_conf.yaml => containerized_node.yaml} (100%)

diff --git a/docs/docker-compose/custom_conf.yaml b/docs/docker-compose/containerized_node.yaml
similarity index 100%
rename from docs/docker-compose/custom_conf.yaml
rename to docs/docker-compose/containerized_node.yaml
diff --git a/docs/docker-compose/start.sh b/docs/docker-compose/start.sh
index 7917e0025..3d812c6a9 100755
--- a/docs/docker-compose/start.sh
+++ b/docs/docker-compose/start.sh
@@ -29,7 +29,10 @@ mkdir -p teuthology/ansible_inventory/hosts teuthology/ansible_inventory/secrets
 cp .teuthology.yaml teuthology/
 cp Dockerfile teuthology/
 cp teuthology.sh teuthology/
-cp custom_conf.yaml teuthology/
+cp containerized_node.yaml teuthology/
+if [ -n "$CUSTOM_CONF" ]; then
+    cp "$CUSTOM_CONF" teuthology/
+fi
 
 
 
diff --git a/docs/docker-compose/teuthology.sh b/docs/docker-compose/teuthology.sh
index 7fdfd221f..edc377b54 100755
--- a/docs/docker-compose/teuthology.sh
+++ b/docs/docker-compose/teuthology.sh
@@ -7,8 +7,11 @@ source /teuthology/virtualenv/bin/activate
 set -x
 if [ -n "$TESTNODES" ]; then
     for node in $(echo $TESTNODES | tr , ' '); do
-        teuthology-update-inventory $node
+        teuthology-update-inventory -m $MACHINE_TYPE $node
     done
+    CUSTOM_CONF=${CUSTOM_CONF:-}
+else
+    CUSTOM_CONF=/teuthology/containerized_node.yaml
 fi
 export MACHINE_TYPE=${MACHINE_TYPE:-testnode}
 teuthology-suite -v \
@@ -26,7 +29,7 @@ teuthology-suite -v \
     -p 75 \
     --seed 349 \
     --force-priority \
-    /teuthology/custom_conf.yaml
+    $CUSTOM_CONF
 teuthology-dispatcher -v \
     --log-dir /teuthology/log \
     --tube $MACHINE_TYPE \
-- 
2.47.3