Update .travis.yml and notififcations
diff --git a/.travis.yml b/.travis.yml
index 9046c79..4f34af2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,18 +13,28 @@
gem 'kitchen-docker'
gem 'kitchen-inspec'
gem 'inspec'
- gem 'kitchen-salt', :git => 'https://github.com/epcim/kitchen-salt.git', :branch => 'dependencis-pkg-repo2'
- #Waiting for PR#78
- #gem 'kitchen-salt', '>=0.2.25'
+ gem 'kitchen-salt', :git => 'https://github.com/salt-formulas/kitchen-salt.git'
- bundle install
env:
- PLATFORM=trevorj/salty-whales:trusty
- PLATFORM=trevorj/salty-whales:xenial
+
before_script:
- set -o pipefail
- make test | tail
script:
- test ! -e .kitchen.yml || bundle exec kitchen test -t tests/integration
+
+notifications:
+ webhooks:
+ urls:
+ - https://webhooks.gitter.im/e/6123573504759330786b
+ on_success: change # options: [always|never|change] default: always
+ on_failure: never # options: [always|never|change] default: always
+ on_start: never # options: [always|never|change] default: always
+ on_cancel: never # options: [always|never|change] default: always
+ on_error: never # options: [always|never|change] default: always
+ email: false
diff --git a/cinder/volume.sls b/cinder/volume.sls
index b5b53fd..82a1db1 100644
--- a/cinder/volume.sls
+++ b/cinder/volume.sls
@@ -58,8 +58,6 @@
{%- if backend.engine in ['iscsi' , 'hp_lefthand'] %}
-{%- if grains.get('virtual_subtype', None) not in ['Docker', 'LXC'] %}
-
cinder_iscsi_packages_{{ loop.index }}:
pkg.installed:
- names:
@@ -89,7 +87,6 @@
{%- endif %}
-{%- endif %}
{%- endif %}
@@ -123,8 +120,6 @@
{%- if backend.engine == 'fujitsu' %}
-{%- if grains.get('virtual_subtype', None) not in ['Docker', 'LXC'] %}
-
cinder_driver_fujitsu_{{ loop.index }}:
pkg.latest:
- name: cinder-driver-fujitsu
@@ -141,8 +136,6 @@
{%- endif %}
-{%- endif %}
-
{%- endfor %}
{%- endif %}
@@ -212,8 +205,6 @@
{%- endif %}
-{%- if grains.get('virtual_subtype', None) not in ['Docker', 'LXC'] %}
-
{%- if volume.storage.engine == 'fujitsu' %}
cinder_driver_fujitsu:
@@ -237,7 +228,5 @@
{%- endif %}
-{%- endif %}
-
{%- endif %}