Fix desktop state

This commit is contained in:
Mike Reeves
2023-06-21 13:49:01 -04:00
parent 9240c3c6f0
commit c13c37f406
5 changed files with 7 additions and 7 deletions

View File

@@ -1,7 +1,7 @@
include:
- workstation.xwindows
- desktop.xwindows
{# If the master is 'salt' then the minion hasn't been configured and isn't connected to the grid. #}
{# We need this since the trusted-ca state uses mine data. #}
{% if grains.master != 'salt' %}
- workstation.trusted-ca
- desktop.trusted-ca
{% endif %}

View File

@@ -295,7 +295,7 @@ desktop_packages:
{% else %}
workstation_packages_os_fail:
desktop_packages_os_fail:
test.fail_without_changes:
- comment: 'SO Analyst Workstation can only be installed on Rocky'

View File

@@ -10,8 +10,8 @@ remove_graphical_target:
- force: True
{% else %}
workstation_trusted-ca_os_fail:
desktop_trusted-ca_os_fail:
test.fail_without_changes:
- comment: 'SO Analyst Workstation can only be installed on CentOS'
- comment: 'SO Desktop can only be installed on Rocky'
{% endif %}

View File

@@ -29,7 +29,7 @@ update_ca_certs:
{% else %}
workstation_trusted-ca_os_fail:
desktop_trusted-ca_os_fail:
test.fail_without_changes:
- comment: 'SO Analyst Workstation can only be installed on CentOS'

View File

@@ -16,7 +16,7 @@ graphical_target:
{% else %}
workstation_xwindows_os_fail:
desktop_xwindows_os_fail:
test.fail_without_changes:
- comment: 'SO Analyst Workstation can only be installed on Rocky'