commit 1126017217430ac178fb35add168e9145bcf98d1
author Ondrej Smola <osmola@mirantis.com> Tue Jun 19 09:07:21 2018 +0000
committer Gerrit Code Review <gerrit2@99e8dbefe3b7> Tue Jun 19 09:07:21 2018 +0000
tree e65cc3782225b94bea362627b395ad44640bd0a2
parent 6c173ffa0406d5d82b404b58ac52707d5d358569
parent c1bb9b8b8d169b26fb4800e31550a7764ab12b09

Merge "Replace deprecated Salt docker state with docker_image"

aptly/publisher.sls

diff --git a/aptly/publisher.sls b/aptly/publisher.sls
index 1cede8d..a286125 100644
--- a/aptly/publisher.sls
+++ b/aptly/publisher.sls
@@ -26,7 +26,11 @@
 {% set registry = publisher.source.registry + "/" if publisher.source.registry is defined else "" %}
 
 {{ publisherImage[0] }}:
+{%- if grains['saltversioninfo'] < [2017, 7] %}
   dockerng.image_present:
+{%- else %}
+  docker_image.present:
+{%- endif %}
     - name: {{ registry }}{{ publisherImage[0] }}:{{ publisherImageTag}}
       force: true
     - require_in: