Fix distinction between Salt and Salt bundle (#1306)

Signed-off-by: Dominik Gedon <[email protected]>
uyuni-project · May 22, 2023 · d3bb569 · d3bb569
1 parent 06ed9fe
commit d3bb569
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/salt/default/ids.sls b/salt/default/ids.sls
@@ -12,4 +12,8 @@ dbus_machine_id:
 
 minion_id_cleared:
   file.absent:
+{% if grains['install_salt_bundle'] %}
+    - name: /etc/venv-salt-minion/minion_id
+{% else %}
     - name: /etc/salt/minion_id
+{% endif %}
diff --git a/salt/default/minimal.sls b/salt/default/minimal.sls
@@ -17,9 +17,10 @@ include:
 minimal_package_update:
   pkg.latest:
     - pkgs:
-      - salt-minion
 {% if grains['install_salt_bundle'] %}
       - venv-salt-minion
+{% else %}
+      - salt-minion
 {% endif %}
 {% if grains['os_family'] == 'Suse' %}
       - zypper

diff --git a/salt/minion/init.sls b/salt/minion/init.sls
@@ -11,7 +11,11 @@ include:
 # https://build.opensuse.org/project/show/systemsmanagement:sumaform:images:microos
 minion_package:
   pkg.installed:
+{% if grains['install_salt_bundle'] %}
+    - name: venv-salt-minion
+{% else %}
     - name: salt-minion
+{% endif %}
     - require:
       - sls: default
 {% endif %}
@@ -36,7 +40,11 @@ reload_systemd_modules:
 
 minion_id:
   file.managed:
+{% if grains['install_salt_bundle'] %}
+    - name: /etc/venv-salt-minion/minion_id
+{% else %}
     - name: /etc/salt/minion_id
+{% endif %}
     - contents: {{ grains['hostname'] }}.{{ grains['domain'] }}
 
 {% if grains.get('auto_connect_to_master') %}
@@ -56,8 +64,13 @@ master_configuration:
 
 minion_service:
   service.running:
+{% if grains['install_salt_bundle'] %}
+    - name: venv-salt-minion
+    - enable: True
+{% else %}
     - name: salt-minion
     - enable: True
+{% endif %}
 {% if grains.get('auto_connect_to_master') %}
     - watch:
       - file: master_configuration

diff --git a/salt/minion/testsuite.sls b/salt/minion/testsuite.sls
@@ -6,7 +6,11 @@
 minion_cucumber_requisites:
   pkg.installed:
     - pkgs:
+{% if grains['install_salt_bundle'] %}
+      - venv-salt-minion
+{% else %}
       - salt-minion
+{% endif %}
       - wget
     - require:
       - sls: default