CB-24484 Fix issues with YARN and Salt 3004+

Salt 3004+ introduced additional systemctl checks for it service module, which is not compatible with the systemctl we have on YARN images. As a workaround, these were replaced with equivalent cmd.run commands for YARN images. Similar issue with the suggested workaround: saltstack/salt#62311 (comment) Also had to bump Salt version to 3006.5: saltstack/salt#65114 (comment)
hortonworks · Jan 19, 2024 · 7f6af1a · 7f6af1a
1 parent 78514e4
commit 7f6af1a
Show file tree

Hide file tree

Showing 11 changed files with 45 additions and 9 deletions.
diff --git a/saltstack/base/salt/mount/init.sls b/saltstack/base/salt/mount/init.sls
@@ -8,9 +8,11 @@
     'googlecompute': {
         'required': False,
     },
+    'default': {
+        'required': False,
+    },
 },
-grain='builder_type',
-default='amazon-ebs'
+grain='builder_type'
 )%}
 
 {% if platform.required and pillar['OS'] == 'centos7' %}

diff --git a/saltstack/base/salt/nginx/init.sls b/saltstack/base/salt/nginx/init.sls
@@ -27,8 +27,13 @@ install_nginx:
     - source: salt://{{ slspath }}/etc/nginx/ssl.conf
 
 enable_nginx:
+{% if pillar['subtype'] != 'Docker' %}
   service.enabled:
     - name: nginx
+{% else %}
+  cmd.run:
+    - name: systemctl enable nginx
+{% endif %}
 {% if pillar['OS'] == 'centos7' %}
     - require:
       - pkg: install_nginx

diff --git a/saltstack/base/salt/performance/thp.sls b/saltstack/base/salt/performance/thp.sls
@@ -16,5 +16,10 @@ disable_thp_service:
 {% endif %}
 
 ensure_disable_thp_enabled:
+{% if pillar['subtype'] != 'Docker' %}
   service.enabled:
-    - name: disable-thp
+    - name: disable-thp
+{% else %}
+  cmd.run:
+    - name: systemctl enable disable-thp
+{% endif %}
diff --git a/saltstack/base/salt/prerequisites/dnsmasq.sls b/saltstack/base/salt/prerequisites/dnsmasq.sls
@@ -1,4 +1,4 @@
 stop_and_disable_dnsmasq:
   service.dead:
     - enable: False
-    - name: dnsmasq
+    - name: dnsmasq
diff --git a/saltstack/base/salt/prerequisites/firewall.sls b/saltstack/base/salt/prerequisites/firewall.sls
@@ -1,9 +1,15 @@
 {% if pillar['OS'] == 'redhat7' or pillar['OS'] == 'redhat8' %}
 
 disable_firewalld_service:
+{% if pillar['subtype'] != 'Docker' %}
   service.dead:
     - name: firewalld
     - enable: False
+{% else %}
+  cmd.run:
+    - name: systemctl disable --now firewalld
+    - onlyif: systemctl is-enabled firewalld
+{% endif %}
 
 {% if pillar['subtype'] != 'Docker' %}
 

diff --git a/saltstack/base/salt/prerequisites/init.sls b/saltstack/base/salt/prerequisites/init.sls
@@ -8,12 +8,12 @@ include:
   - {{ slspath }}.sysctl
   - {{ slspath }}.disable_ipv6
   - {{ slspath }}.selinux
+  - {{ slspath }}.dnsmasq
 {% endif %}
   - {{ slspath }}.motd
   - {{ slspath }}.ssh
   - {{ slspath }}.pip
   - {{ slspath }}.cert-tool
-  - {{ slspath }}.dnsmasq
   - {{ slspath }}.user
   - {{ slspath }}.firewall
   - {{ slspath }}.umask

diff --git a/saltstack/base/salt/salt-bootstrap/init.sls b/saltstack/base/salt/salt-bootstrap/init.sls
@@ -19,8 +19,13 @@ create_saltbootstrap_service_files:
     - source: salt://{{ slspath }}/etc/systemd/system/salt-bootstrap.service
 
 salt-bootstrap:
+{% if pillar['subtype'] != 'Docker' %}
   service.running:
     - enable: True
+{% else %}
+  cmd.run:
+    - name: systemctl enable salt-bootstrap
+{% endif %}
     - require:
       - install_saltbootstrap
       - create_saltbootstrap_service_files
diff --git a/saltstack/hortonworks/salt/kerberos/haveged.sls b/saltstack/hortonworks/salt/kerberos/haveged.sls
@@ -7,7 +7,12 @@ install_haveged_packages:
 {% endif %}    
 
 service_haveged:
+{% if pillar['subtype'] != 'Docker' %}
   service.enabled:
     - name: haveged
+{% else %}
+  cmd.run:
+    - name: systemctl enable haveged
+{% endif %}
     - require:
       - pkg: install_haveged_packages
diff --git a/saltstack/hortonworks/salt/unbound/init.sls b/saltstack/hortonworks/salt/unbound/init.sls
@@ -21,6 +21,11 @@ unbound_service:
 {% endif %}
 
 enable_unbound:
+{% if pillar['subtype'] != 'Docker' %}
   service.running:
     - name: unbound
     - enable: True
+{% else %}
+  cmd.run:
+    - name: systemctl enable --now unbound
+{% endif %}
diff --git a/scripts/get-salt-version.sh b/scripts/get-salt-version.sh
@@ -44,10 +44,10 @@ if [[ $BASE_NAME == "cb" ]]; then
     COMP_RESULT=$?
     # Stack version >= 7.2.18
     if [[ $COMP_RESULT -lt 2 ]]; then
-      SALT_VERSION=3006.4
+      SALT_VERSION=3006.5
     fi
   else # base image
-    SALT_VERSION=3006.4
+    SALT_VERSION=3006.5
   fi
 fi
 

diff --git a/scripts/salt-setup.sh b/scripts/salt-setup.sh
@@ -31,7 +31,8 @@ EOF
 }
 
 function apply_rhel8_salt_patch {
-  if [ "${OS}" == "redhat8" ] ; then
+  if [ "${OS}" == "redhat8" ] && [ "${SALT_VERSION}" == "3001.8" ] ; then
+    # https://github.com/saltstack/salt/issues/60232
     if [ -f "/opt/salt_3001.8/lib/python3.6/site-packages/salt/modules/network.py" ]; then
       patch -t -u /opt/salt_3001.8/lib/python3.6/site-packages/salt/modules/network.py -i /tmp/rhel8_salt_fix.patch
     fi
@@ -65,12 +66,14 @@ function add_single_role_for_cluster_salt {
 }
 
 function add_builder_type_grain {
-  echo "Adding ${PACKER_BUILDER_TYPE} to the grains"
+  if [ -n "${PACKER_BUILDER_TYPE}" ]; then
+    echo "Adding ${PACKER_BUILDER_TYPE} to the grains"
 cat << EOF >> /tmp/saltstack/config/minion
 grains:
   builder_type:
     - ${PACKER_BUILDER_TYPE}
 EOF
+  fi
 }
 
 function add_prewarmed_roles {