Deleting deprecated function and test with 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: I5153c5d78f014b88119792b73b7cb252e8d227f5
diff --git a/.kitchen.yml b/.kitchen.yml
index e5902e0..1dbdb3c 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: horizon
@@ -33,7 +33,7 @@
driver_config:
image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial'%>
platform: ubuntu
-
+
# - name: centos-7.1
suites:
diff --git a/.travis.yml b/.travis.yml
index b71896c..f42fc6d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,6 +17,10 @@
- bundle install
env:
+ - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=cluster
+ - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=cluster
+ - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=single
+ - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=single
- PLATFORM=trevorj/salty-whales:trusty SUITE=cluster
- PLATFORM=trevorj/salty-whales:xenial SUITE=cluster
- PLATFORM=trevorj/salty-whales:trusty SUITE=single
diff --git a/horizon/meta/sphinx.yml b/horizon/meta/sphinx.yml
index b71bf2d..bdb372f 100644
--- a/horizon/meta/sphinx.yml
+++ b/horizon/meta/sphinx.yml
@@ -27,6 +27,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 %}
\ No newline at end of file
+ {%- endif %}
diff --git a/horizon/server/service.sls b/horizon/server/service.sls
index e7fd51c..a52a550 100644
--- a/horizon/server/service.sls
+++ b/horizon/server/service.sls
@@ -82,11 +82,11 @@
{%- if grains.os_family == 'Debian' %}
apache_enable_wsgi:
- apache_module.enable:
+ apache_module.enabled:
- name: wsgi
enable_horizon_apache_config:
- apache_conf.enable:
+ apache_conf.enabled:
- name: openstack-dashboard
- require:
- file: horizon_apache_config