diff --git a/pillar/common.sls b/pillar/common.sls index 247086d..1253f7e 100644 --- a/pillar/common.sls +++ b/pillar/common.sls @@ -4,6 +4,30 @@ locale: default: name: 'en_US.UTF-8' requires: 'en_US.UTF-8 UTF-8' +ntp: + ng: + settings: + ntpd: true + ntp_conf: + controlkey: + - 1 + disable: + - monitor + driftfile: + - /var/lib/ntp/drift/ntp.drift + logfile: + - /var/log/ntp + keys: + - /etc/ntp.keys + requestkey: + - 1 + restrict: + - -4 default kod notrap nomodify nopeer + - -6 default kod notrap nomodify nopeer + - 127.0.0.1 + - ::1 + trustedkey: + - 1 timezone: name: 'UTC' utc: True diff --git a/pillar/top.sls b/pillar/top.sls index b039add..b36f382 100644 --- a/pillar/top.sls +++ b/pillar/top.sls @@ -16,6 +16,9 @@ production: - role.{{ role }} {% endfor %} {% if virt_cluster %} + 'virt_cluster:{{ virt_cluster }}: + - match: grain + - virt_cluster.{{ virt_cluster }} 'G@virt_cluster:{{ virt_cluster }} and G@virtual:{{ virtual }}': - match: compound - virt_cluster.{{ virt_cluster }}.{{ virtual }} diff --git a/pillar/virt_cluster/atreju.sls b/pillar/virt_cluster/atreju.sls index 792d600..6fc6d42 100644 --- a/pillar/virt_cluster/atreju.sls +++ b/pillar/virt_cluster/atreju.sls @@ -1 +1,8 @@ -# +ntp: + ng: + settings: + ntp_conf: + restrict: + - smt-internal.opensuse.org + server: + - smt-internal.opensuse.org diff --git a/pillar/virt_cluster/atreju/kvm.sls b/pillar/virt_cluster/atreju/kvm.sls new file mode 100644 index 0000000..792d600 --- /dev/null +++ b/pillar/virt_cluster/atreju/kvm.sls @@ -0,0 +1 @@ +# diff --git a/salt/profile/regional.sls b/salt/profile/regional.sls index 849aabb..a06fd18 100644 --- a/salt/profile/regional.sls +++ b/salt/profile/regional.sls @@ -1,3 +1,4 @@ include: - locale + - ntp - timezone