commit d04e386bf3db679e7e3123b6e03c88413f381f30
author Jakub Josef <jjosef@mirantis.com> Tue Jan 23 12:32:02 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Tue Jan 23 12:32:02 2018 +0000
tree 3f1c327da6d2be0f2a57a8ccf25620ac49ed58d6
parent 83aecfc7865097d523e2e49ffbcce943894311f4
parent 523fd64deac7f90eeb69b5c0b305d8caeee5e0aa

Merge "Deleting deprecated function and switch test to 2017.7"

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index da050d9..bdbd54e 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: neutron

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index ee25926..f045b94 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,44 @@
   - bundle install
 
 env:
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=compute-dpdk
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-dpdk
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=compute-dvr
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-dvr
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-dvr-fwaas-v1
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=compute-legacy
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-legacy
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=compute-nonexternal-dvr
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-nonexternal-dvr
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=compute-sriov
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-sriov
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=compute-qos-sriov
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-qos-sriov
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=compute-qos
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-qos
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=compute-ovn
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=control-cluster
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-cluster
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=control-dvr
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-dvr
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=control-nodvr
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-nodvr
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=control-single
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-single
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-lbaas-octavia
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-fwaas-v1
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=control-qos
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-qos
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-ovn
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=control-dns
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=control-dns
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=gateway-dvr
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=gateway-dvr
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=gateway-legacy
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=gateway-legacy
+    - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=gateway-qos
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=gateway-qos
+    - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=gateway-legacy-fwaas-v1
     - PLATFORM=trevorj/salty-whales:trusty SUITE=compute-dpdk
     - PLATFORM=trevorj/salty-whales:xenial SUITE=compute-dpdk
     - PLATFORM=trevorj/salty-whales:trusty SUITE=compute-dvr
@@ -55,7 +93,6 @@
     - PLATFORM=trevorj/salty-whales:trusty SUITE=gateway-qos
     - PLATFORM=trevorj/salty-whales:xenial SUITE=gateway-qos
     - PLATFORM=trevorj/salty-whales:xenial SUITE=gateway-legacy-fwaas-v1
-
 before_script:
   - set -o pipefail
   - make test | tail

neutron/meta/sphinx.yml

diff --git a/neutron/meta/sphinx.yml b/neutron/meta/sphinx.yml
index 20af434..f655e76 100644
--- a/neutron/meta/sphinx.yml
+++ b/neutron/meta/sphinx.yml
@@ -36,6 +36,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 %}