Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(ng/init.sls): use grains.get to detect containers #45

Merged
merged 1 commit into from
Nov 1, 2019
Merged

refactor(ng/init.sls): use grains.get to detect containers #45

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ntp/ng/init.sls
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ ntpd_conf:
{% set service_state = service.get(ntp.settings.ntpd) %}
{# Do not attempt to run the service in a container where the service is configured with #}
{# `ConditionVirtualization=!container` or similar (e.g. via. `kitchen-salt`) #}
{% if grains.os_family in ['Suse'] and salt['config.get']('virtual_subtype', '') in ['Docker'] %}
{% if grains.os_family in ['Suse'] and
salt['grains.get']('virtual_subtype', '') in ['Docker', 'LXC', 'kubernetes', 'libpod'] %}
{% set service_state = 'dead' %}
{% endif %}
ntpd:
Expand Down