Merge "Do not remove inventory file if placed in /etc/kolla"

ansible/roles/destroy/tasks/cleanup_host.yml

@@ -14,6 +14,7 @@
     kolla_dev_repos_directory: "{{ kolla_dev_repos_directory }}"
     opensearch_datadir_volume: "{{ opensearch_datadir_volume }}"
     destroy_include_dev: "{{ destroy_include_dev }}"
+    kolla_ansible_inventories: "{{ inventories_comma_separated.replace(',',' ') }}"
 
 - block:
     - name: Disable octavia-interface service

releasenotes/notes/bug-2052706-dfbbc75fc72c74d1.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Fixes kolla-ansible removing inventory file placed in
+    ``/etc/kolla/<inventory>``.
+    See `LP#2052706 <https://launchpad.net/bugs/2052706>`__
+    for more details.

tools/cleanup-host

@@ -77,14 +77,27 @@ fi
 
 echo "Getting folders name..."
 for dir in $FOLDER_PATH/*; do
+    skip="false"
+
+    for inventory in $kolla_ansible_inventories; do
+        if [ "$dir" == "$inventory" ]; then
+            skip="true"
+            break
+        fi
+    done
+
     if [ "$dir" == "$FOLDER_PATH/passwords.yml" ] || \
        [ "$dir" == "$FOLDER_PATH/globals.yml" ] || \
        [ "$dir" == "$FOLDER_PATH/globals.d" ] || \
        [ "$dir" == "$FOLDER_PATH/kolla-build.conf" ] || \
        [ "$dir" == "$FOLDER_PATH/config" ] || \
        [ "$dir" == "$FOLDER_PATH/certificates" ]; then
-        echo "Skipping:" $dir
-    else
+        echo "Skipping: $dir"
+        skip="true"
+    fi
+
+    # If it's not to be skipped, remove it
+    if [ "$skip" == "false" ]; then
         rm -rfv $dir
     fi
 done

tools/kolla-ansible

@@ -458,12 +458,20 @@ case "$1" in
 (destroy)
         ACTION="Destroy Kolla containers, volumes and host configuration"
         PLAYBOOK="${BASEDIR}/ansible/destroy.yml"
+
+        INVENTORIES_COMMA_SEPARATED=""
+        for INVENTORY in ${INVENTORIES[@]}; do
+            INVENTORIES_COMMA_SEPARATED="${INVENTORIES_COMMA_SEPARATED},${INVENTORY}"
+        done
+        INVENTORIES_COMMA_SEPARATED=$(echo "${INVENTORIES_COMMA_SEPARATED}" | sed -e 's/^,//g')
+
         if [[ "${INCLUDE_IMAGES}" == "--include-images" ]]; then
             EXTRA_OPTS="$EXTRA_OPTS -e destroy_include_images=yes"
         fi
         if [[ "${INCLUDE_DEV}" == "--include-dev" ]]; then
             EXTRA_OPTS="$EXTRA_OPTS -e destroy_include_dev=yes"
         fi
+        EXTRA_OPTS="$EXTRA_OPTS -e inventories_comma_separated=${INVENTORIES_COMMA_SEPARATED}"
         if [[ "${DANGER_CONFIRM}" != "--yes-i-really-really-mean-it" ]]; then
             cat << EOF
 WARNING: