Deleting deprecated function and switch test to 2017.7
The patch deletes deprecated cmd.run function which actually
was defined in salt 2016 as alias for cmd.shell therefore this
change supports backward compatibility.
Change-Id: I6e6e9fb60cdd2a46c02275e0740fb96e17e9238c
Related-PROD: 17056
diff --git a/.kitchen.yml b/.kitchen.yml
index 04266e2..6d7a1b2 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -8,7 +8,7 @@
name: salt_solo
salt_install: bootstrap
salt_bootstrap_url: https://bootstrap.saltstack.com
- salt_version: latest
+ salt_version: <%=ENV['SALT_VERSION'] || 'latest'%>
require_chef: false
log_level: error
formula: designate
@@ -58,4 +58,4 @@
pillars-from-files:
designate.sls: tests/pillar/designate_ocata.sls
-# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
\ No newline at end of file
+# vim: ft=yaml sw=2 ts=2 sts=2 tw=125
diff --git a/.travis.yml b/.travis.yml
index 03a7f7b..3241f95 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,7 @@
- bundle install
env:
+ - PLATFORM=trevorj/salty-whales:xenial-2017.7
- PLATFORM=trevorj/salty-whales:xenial
before_script:
diff --git a/designate/meta/sphinx.yml b/designate/meta/sphinx.yml
index 685bac1..8bafca9 100644
--- a/designate/meta/sphinx.yml
+++ b/designate/meta/sphinx.yml
@@ -37,6 +37,6 @@
value: |
{%- for pkg in server.pkgs %}
{%- set pkg_version = "dpkg -l "+pkg+" | grep "+pkg+" | awk '{print $3}'" %}
- * {{ pkg }}: {{ salt['cmd.run'](pkg_version) }}
+ * {{ pkg }}: {{ salt['cmd.shell'](pkg_version) }}
{%- endfor %}
{%- endif %}