X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fbash%2Ffunction%2Fansible.sh;h=64508bda111d1646626b9dde467b1a8bb887da93;hp=3beca3fba43c14434436a6560c43fd45357cc97a;hb=647a693a245ae450756fb3bd9446db856e712812;hpb=ae5cd8ce30c435a83868ff7e13d88d41594c227c

diff --git a/resources/libraries/bash/function/ansible.sh b/resources/libraries/bash/function/ansible.sh
index 3beca3fba4..64508bda11 100644
--- a/resources/libraries/bash/function/ansible.sh
+++ b/resources/libraries/bash/function/ansible.sh
@@ -23,9 +23,19 @@ function ansible_adhoc () {
     # Variable read:
     # - ${WORKING_TOPOLOGY} - Reserved working topology.
     # - ${CSIT_DIR} - CSIT main directory, where ansible playbooks are located.
+    # - ${FLAVOR} - Node flavor string, see common.sh
 
     set -exuo pipefail
 
+    case "$FLAVOR" in
+        "aws")
+            INVENTORY_PATH="cloud_inventory"
+            ;;
+        *)
+            INVENTORY_PATH="lf_inventory"
+            ;;
+    esac
+
     if ! installed sshpass; then
         die "Please install sshpass!"
     fi
@@ -40,7 +50,7 @@ function ansible_adhoc () {
     ansible-playbook \
         --vault-password-file=vault_pass \
         --extra-vars '@vault.yml' \
-        --inventory inventories/lf_inventory/hosts site.yaml \
+        --inventory inventories/$INVENTORY_PATH/hosts site.yaml \
         --limit "$(echo ${hosts[@]//\"})" \
         --module-name shell \
         --args \"$(echo $@)\" || die "Failed to run ansible on host!"
@@ -55,9 +65,19 @@ function ansible_playbook () {
     # Variable read:
     # - ${WORKING_TOPOLOGY} - Reserved working topology.
     # - ${CSIT_DIR} - CSIT main directory, where ansible playbooks are located.
+    # - ${FLAVOR} - Node flavor string, see common.sh
 
     set -exuo pipefail
 
+    case "$FLAVOR" in
+        "aws")
+            INVENTORY_PATH="cloud_inventory"
+            ;;
+        *)
+            INVENTORY_PATH="lf_inventory"
+            ;;
+    esac
+
     if ! installed sshpass; then
         die "Please install sshpass!"
     fi
@@ -72,7 +92,7 @@ function ansible_playbook () {
     ansible-playbook \
         --vault-password-file=vault_pass \
         --extra-vars '@vault.yml' \
-        --inventory inventories/lf_inventory/hosts site.yaml \
+        --inventory inventories/$INVENTORY_PATH/hosts site.yaml \
         --limit "$(echo ${hosts[@]//\"})" \
         --tags "$(echo $@)" || die "Failed to run ansible on host!"
     popd || die "Popd failed!"