docker-compose: Optionally use an inventory repo

This is being added to support "real" testnodes without having to
manually copy inventory fragments over.

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

diff --git a/docs/docker-compose/Dockerfile b/docs/docker-compose/Dockerfile
index 5b46ea239a74432724d82e02cf03bc2d31077b37..adcf8246154124adea497c6908ab6c020a70b53c 100644 (file)
--- a/docs/docker-compose/Dockerfile
+++ b/docs/docker-compose/Dockerfile
@@ -32,4 +32,6 @@ RUN \
     chmod +x /teuthology/bootstrap && \
     ./bootstrap
 COPY teuthology.sh /
+RUN mkdir -p /etc/ansible
+COPY ansible_inventory/hosts ansible_inventory/secrets /etc/ansible/
 ENTRYPOINT /teuthology.sh
\ No newline at end of file

diff --git a/docs/docker-compose/start.sh b/docs/docker-compose/start.sh
index c48530b2a26a97e9b970e90b8944600ebfd61272..7917e00250d8ebf41bb733aff48c6750fc1d66cd 100755 (executable)
--- a/docs/docker-compose/start.sh
+++ b/docs/docker-compose/start.sh
@@ -9,6 +9,22 @@ if [ ! -d ./teuthology ]; then
     -b ${TEUTHOLOGY_BRANCH:-$(git branch --show-current)} \
     https://github.com/ceph/teuthology.git
 fi
+if [ -n "$ANSIBLE_INVENTORY_REPO" ]; then
+    basename=$(basename $ANSIBLE_INVENTORY_REPO | cut -d. -f1)
+    if [ ! -d "$basename" ]; then
+        git clone \
+            --depth 1 \
+            $ANSIBLE_INVENTORY_REPO
+    fi
+    mkdir -p teuthology/ansible_inventory
+    cp -rf $basename/ansible/ teuthology/ansible_inventory
+    if [ ! -d teuthology/ansible_inventory/hosts ]; then
+        mv -f teuthology/ansible_inventory/inventory teuthology/ansible_inventory/hosts
+    fi
+fi
+# Make the hosts and secrets directories, so that the COPY instruction in the 
+# Dockerfile does not cause a build failure when not using this feature.
+mkdir -p teuthology/ansible_inventory/hosts teuthology/ansible_inventory/secrets
 
 cp .teuthology.yaml teuthology/
 cp Dockerfile teuthology/