Merge pull request #820 from splunk/improvements_features

improvements
splunk · Jul 10, 2023 · a081d39 · a081d39
2 parents ca6231f + 3c8ade9
commit a081d39
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/packer/ansible/linux_server.yml b/packer/ansible/linux_server.yml
@@ -5,10 +5,10 @@
     - role: linux_common
       when: use_prebuilt_images_with_packer == "0"
     - role: linux_universal_forwarder
-      when: use_prebuilt_images_with_packer == "0"
+      when: (use_prebuilt_images_with_packer == "0") and (install_contentctl == "0")
     - role: linux_osquery
-      when: use_prebuilt_images_with_packer == "0"
+      when: (use_prebuilt_images_with_packer == "0") and (install_contentctl == "0")
     - role: linux_sysmon
-      when: use_prebuilt_images_with_packer == "0"
+      when: (use_prebuilt_images_with_packer == "0") and (install_contentctl == "0")
     - role: linux_install_art
-      when: use_prebuilt_images_with_packer == "0"
+      when: (use_prebuilt_images_with_packer == "0") and (install_contentctl == "0")
diff --git a/packer/ansible/roles/linux_common/tasks/update_packages.yml b/packer/ansible/roles/linux_common/tasks/update_packages.yml
@@ -8,6 +8,10 @@
     name: acl
     state: present
 
+- name: Install Acl Retry
+  apt:
+    name: acl
+    state: present
 
 - name: Check if a reboot is needed for Debian and Ubuntu boxes
   register: reboot_required_file

diff --git a/terraform/ansible/linux_server_post.yml b/terraform/ansible/linux_server_post.yml
@@ -2,9 +2,14 @@
   gather_facts: False
   become: true
   roles:
-    - set_hostname_linux
-    - linux_server_post
-    - update_sysmon_config_linux
-    - linux_agent_prelude
-    - splunk_byo_linux
-    - contentctl
+    - role: set_hostname_linux
+    - role: linux_server_post
+      when: install_contentctl == "0"
+    - role: update_sysmon_config_linux
+      when: install_contentctl == "0"
+    - role: linux_agent_prelude
+      when: install_contentctl == "0"
+    - role: splunk_byo_linux
+      when: install_contentctl == "0"
+    - role: contentctl
+      when: install_contentctl == "1"