Skip to content

Commit

Permalink
stage3: don't do time sync if not configured
Browse files Browse the repository at this point in the history
Currently if time service is set to disabled we still call ceph.time
which tries to sync to the configured ntp server (default master), and
we fail since the time server was disabled, there wouldn't be an ntp
server in master, the other option of actually creating a no op sls file
seems counterintuitive to the validate check and global option of
setting a value to disabled.

Fixes: SUSE#102
Signed-off-by: Abhishek Lekshmanan <abhishek@suse.com>
  • Loading branch information
theanalyst committed Feb 10, 2017
1 parent d1b4ce3 commit bcdfb08
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions srv/salt/ceph/stage/deploy/default.sls
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,13 @@ validate failed:
{% endif %}


{% if salt['pillar.get']('time_service') != "disabled" %}
time:
salt.state:
- tgt: 'I@cluster:ceph'
- tgt_type: compound
- sls: ceph.time
{% endif %}

packages:
salt.state:
Expand Down

0 comments on commit bcdfb08

Please sign in to comment.