Merge pull request #45 from IBM/dariuszglocki

Dariuszglocki

README.md

@@ -2,7 +2,7 @@
 
 Disconnected scans allow for discovering software and hardware inventory by running scripts that are provided in the disconnected scanner package. The scripts initiate software and capacity scans, and create a package with scan results that you later need to upload to the License Metric Tool server. You can automate management of disconnected scans by using [Ansible](https://docs.ansible.com/ansible/latest/index.html#about-ansible).
 
-The current version of License Metric Tool playbooks is **9.2.33**
+The current version of License Metric Tool playbooks is **9.2.34**
 
 
 ## Prerequisites

collections /requirements.yml → collections/requirements.yml

@@ -4,4 +4,4 @@ collections:
   - ansible.windows
   - community.windows
   - community.general
-  - microsoft.ad
+  - microsoft.ad

roles/ilmt_scanner/tasks/install_scanner_ibmi.yml

@@ -72,6 +72,12 @@
               when: computer_properties_file_exists.stat.exists
       when: (hostvars[inventory_hostname]['scanner_version'] != '0.0' or ilmt_scanner_installed_ibmi.stat.exists)
 
+    - name: "Create disconnected scanner directory on IBM i endpoints"
+      file:
+        path: "{{ lmt_scanner_path_ibmi }}"
+        state: directory
+        mode: '0755'
+
     - name: "Define installation root directory on IBM i endpoints"
       set_fact:
         ibmi_root_dir: "{{ '/' + lmt_scanner_path_ibmi.split('/')[1] | lower + '/' + lmt_scanner_path_ibmi.split('/')[2] | lower \
@@ -96,12 +102,6 @@
           when: ibmi_available_disk_space.stdout | int <
             lmt_scanner_ibmi_scanner_minimum_disk_space | int
 
-    - name: "Create disconnected scanner directory on IBM i endpoints"
-      file:
-        path: "{{ lmt_scanner_path_ibmi }}"
-        state: directory
-        mode: '0755'
-
     - name: "Upload scanner installer from Control Node to IBM i endpoints"
       vars:
         source_file: "{{ scanner_package_file }}"

roles/ilmt_scanner/tasks/install_scanner_unix.yml

@@ -56,6 +56,12 @@
         leave_config_backup: "{{ ilmt_scanner_installed_unix.stat.exists }}"
       when: (hostvars[inventory_hostname]['scanner_version'] != '0.0' or ilmt_scanner_installed_unix.stat.exists)
 
+    - name: "Create disconnected scanner directory on UNIX/Linux endpoints"
+      file:
+        path: "{{ lmt_scanner_path_unix }}"
+        state: directory
+        mode: '0755'
+
     - name: "Define installation root directory on UNIX/Linux endpoints"
       set_fact:
         unix_root_dir: "{{ '/' + lmt_scanner_path_unix.split('/')[1] | lower + '/' + lmt_scanner_path_unix.split('/')[2] | lower \
@@ -112,12 +118,6 @@
             lmt_scanner_aix_scanner_minimum_disk_space | int
       when: lmt_scanner_platform == 'aix'
 
-    - name: "Create disconnected scanner directory on UNIX/Linux endpoints"
-      file:
-        path: "{{ lmt_scanner_path_unix }}"
-        state: directory
-        mode: '0755'
-
     - name: "Upload scanner installer from Control Node to UNIX/Linux endpoints"
       vars:
         source_file: "{{ scanner_package_file }}"

roles/ilmt_scanner/vars/main.yml

@@ -18,4 +18,4 @@ lmt_scanner_aix_scanner_minimum_disk_space: 100
 # required_ibmi_space_in_MBs
 lmt_scanner_ibmi_scanner_minimum_disk_space: 120
 # Playbooks version - should be in-line with LMT server version and upgraded during each release
-lmt_playbooks_version: "9.2.33.0"
+lmt_playbooks_version: "9.2.34.0"