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>

diff --git a/docs/docker-compose/containerized_node.yaml b/docs/docker-compose/containerized_node.yaml
new file mode 100644 (file)
index 0000000..0230488
--- /dev/null
+++ b/docs/docker-compose/containerized_node.yaml
@@ -0,0 +1,8 @@
+overrides:
+  ansible.cephlab:
+    skip_tags: "timezone,nagios,monitoring-scripts,ssh,hostname,pubkeys,zap,sudoers,kerberos,selinux,lvm,ntp-client,resolvconf,packages,cpan,nfs"
+    vars:
+      containerized_node: true
+      ansible_user: root
+      cm_user: root
+      start_rpcbind: false

diff --git a/docs/docker-compose/custom_conf.yaml b/docs/docker-compose/custom_conf.yaml
deleted file mode 100644 (file)
index 0230488..0000000
--- a/docs/docker-compose/custom_conf.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-overrides:
-  ansible.cephlab:
-    skip_tags: "timezone,nagios,monitoring-scripts,ssh,hostname,pubkeys,zap,sudoers,kerberos,selinux,lvm,ntp-client,resolvconf,packages,cpan,nfs"
-    vars:
-      containerized_node: true
-      ansible_user: root
-      cm_user: root
-      start_rpcbind: false

diff --git a/docs/docker-compose/start.sh b/docs/docker-compose/start.sh
index 7917e00250d8ebf41bb733aff48c6750fc1d66cd..3d812c6a90d42513677aacc8ff72952a7d3c3b03 100755 (executable)
--- 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 7fdfd221f47094f7cf2800996de939f46fc1bc1c..edc377b54eb6f708406bf4056efdae8ce2661286 100755 (executable)
--- 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 \