diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-10-05 12:41:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-05 12:41:16 -0400 |
| commit | 8e2019c9c3840a64425c34c23ace9e9cbd6b7eb0 (patch) | |
| tree | 6574d1a34ee7de7f1c176b4dc1efee02dab9c4e0 | |
| parent | 2dde1853efe73b7b6f185ce918aaaefeac20334c (diff) | |
| parent | e78792094614261bf65c2c075ab10aeba6459207 (diff) | |
| download | openshift-8e2019c9c3840a64425c34c23ace9e9cbd6b7eb0.tar.gz openshift-8e2019c9c3840a64425c34c23ace9e9cbd6b7eb0.tar.bz2 openshift-8e2019c9c3840a64425c34c23ace9e9cbd6b7eb0.tar.xz openshift-8e2019c9c3840a64425c34c23ace9e9cbd6b7eb0.zip | |
Merge pull request #5644 from etsauer/installer-image-directory-support
Adding support for an inventory directory/hybrid inventory
| -rw-r--r-- | images/installer/README_CONTAINER_IMAGE.md | 4 | ||||
| -rwxr-xr-x | images/installer/root/usr/local/bin/run | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/images/installer/README_CONTAINER_IMAGE.md b/images/installer/README_CONTAINER_IMAGE.md index bc1ebb4a8..bfe3661c0 100644 --- a/images/installer/README_CONTAINER_IMAGE.md +++ b/images/installer/README_CONTAINER_IMAGE.md @@ -45,4 +45,6 @@ These options may be set via the ``atomic`` ``--set`` flag. For defaults see ``r * ANSIBLE_CONFIG - Full path for the ansible configuration file to use inside the container -* INVENTORY_FILE - Full path for the inventory to use from the host
\ No newline at end of file +* INVENTORY_FILE - Full path for the inventory to use from the host + +* INVENTORY_DIR - Full path for the inventory directory to use (e.g. for use with a hybrid dynamic/static inventory) diff --git a/images/installer/root/usr/local/bin/run b/images/installer/root/usr/local/bin/run index 70aa0bac3..cd38a6ff0 100755 --- a/images/installer/root/usr/local/bin/run +++ b/images/installer/root/usr/local/bin/run @@ -19,6 +19,9 @@ if [[ -v INVENTORY_FILE ]]; then # Make a copy so that ALLOW_ANSIBLE_CONNECTION_LOCAL below # does not attempt to modify the original cp -a ${INVENTORY_FILE} ${INVENTORY} +elif [[ -v INVENTORY_DIR ]]; then + INVENTORY="$(mktemp -d)" + cp -R ${INVENTORY_DIR}/* ${INVENTORY} elif [[ -v INVENTORY_URL ]]; then curl -o ${INVENTORY} ${INVENTORY_URL} elif [[ -v DYNAMIC_SCRIPT_URL ]]; then @@ -29,7 +32,7 @@ elif [[ -v GENERATE_INVENTORY ]]; then /usr/local/bin/generate ${INVENTORY} else echo - echo "One of INVENTORY_FILE, INVENTORY_URL, GENERATE_INVENTORY, or DYNAMIC_SCRIPT_URL must be provided." + echo "One of INVENTORY_FILE, INVENTORY_DIR, INVENTORY_URL, GENERATE_INVENTORY, or DYNAMIC_SCRIPT_URL must be provided." exec /usr/local/bin/usage fi INVENTORY_ARG="-i ${INVENTORY}" |