Merge pull request #7733 from Security-Onion-Solutions/m0duspwnens-salt-3004.1

remove saltstack repo created by bootstrap-salt for ubuntu

salt/common/tools/sbin/soup

@@ -946,6 +946,7 @@ update_repo() {
       exit 1
     fi
 
+    rm -f /etc/apt/sources.list.d/salt.list
     echo "deb https://repo.securityonion.net/file/securityonion-repo/ubuntu/$ubuntu_version/amd64/salt $OSVER main" > /etc/apt/sources.list.d/saltstack.list
     apt-get update
   fi

salt/repo/client/ubuntu.sls

@@ -1,5 +1,20 @@
+# this removes the repo file left by bootstrap-salt.sh without -r
+remove_salt.list:
+  file.absent:
+    - name: /etc/apt/sources.list.d/salt.list
+
 saltstack.list:
   file.managed:
     - name: /etc/apt/sources.list.d/saltstack.list
     - contents:
       - deb https://repo.securityonion.net/file/securityonion-repo/ubuntu/{{grains.osrelease}}/amd64/salt/ {{grains.oscodename}} main
+
+apt_update:
+  cmd.run:
+    - name: apt-get update
+    - onchanges:
+      - file: saltstack.list
+    - timeout: 30
+    - retry:
+        attempts: 5
+        interval: 30