Fix installing only classic confinement snaps

- Fix check when only classic snaps are installed
- Replace aws-sdk gem and makerlabs python package with attrs to speedup
  integration test
- Fix fuse dependency for sanpd testing on Ubuntu docker instance# Please enter the commit message for your changes. Lines starting

packages/defaults.yaml

@@ -22,7 +22,7 @@ packages:
       states: []
       pkgs: []
   snaps:
-    package: snapd
+    packages: ['snapd', 'fuse',]
     collides: []
     symlink: False
     service: ['snapd',]

packages/osmap.yaml

@@ -17,4 +17,3 @@ Fedora:
 Centos:
   snaps:
     package:
-

packages/snaps.sls

@@ -4,7 +4,7 @@
 
 # As we are 'extend'ing pkg_req_pkgs and unwanted_pkgs, we need to concatenate
 # the attributes correctly (see #17)
-{% set req_packages = packages.pkgs.required.pkgs + [packages.snaps.package] %}
+{% set req_packages = packages.pkgs.required.pkgs + packages.snaps.packages %}
 {% set req_states = packages.pkgs.required.states + packages.snaps.required.states %}
 {% set unwanted_packages = packages.pkgs.unwanted + packages.snaps.collides %}
 
@@ -12,8 +12,8 @@
 {% set classic_snaps = packages.snaps.classic %}
 {% set unwanted_snaps = packages.snaps.unwanted %}
 
-{%- if packages.snaps.package %}
-  {% if packages.snaps.wanted or packages.snaps.unwanted %}
+{%- if packages.snaps.packages %}
+  {% if wanted_snaps or classic_snaps or unwanted_snaps %}
 
 ### REQ PKGS (without this, SNAPS can fail to install/uninstall)
 include:
@@ -56,7 +56,7 @@ packages-{{ snap }}-service:
       - pkg: pkg_req_pkgs
       - pkg: unwanted_pkgs
 {% endfor %}
-  
+
 ### SNAPS to install
 {% for snap in wanted_snaps %}
 packages-snapd-{{ snap }}-wanted:

pillar.example

@@ -25,7 +25,7 @@ packages:
   pips:
     wanted:
       - dxpy
-      - makerlabs
+      - attrs
     unwanted:
       - campbel
       - reverse_geocode
@@ -33,7 +33,7 @@ packages:
   gems:
     wanted:
       - progressbar
-      - aws-sdk
+      - minitest
     unwanted:
       - diff-lcs
       - kitchen-vagrant

test/integration/default/gems_spec.rb

@@ -4,7 +4,7 @@ control 'Wanted/Required gems' do
 
   %w{
     progressbar
-    aws-sdk
+    minitest
   }.each do |p|
     describe gem(p) do
       it { should be_installed }

test/integration/default/pillar.example.fedora

@@ -19,7 +19,7 @@ packages:
   pips:
     wanted:
       - dxpy
-      - makerlabs
+      - attrs
     unwanted:
       - campbel
       - reverse_geocode
@@ -27,7 +27,7 @@ packages:
   gems:
     wanted:
       - progressbar
-      - aws-sdk
+      - minitest
     unwanted:
       - diff-lcs
       - kitchen-vagrant

test/integration/default/pillar.example.redhat

@@ -18,7 +18,7 @@ packages:
   pips:
     wanted:
       - dxpy
-      - makerlabs
+      - attrs
     unwanted:
       - campbel
       - reverse_geocode
@@ -26,7 +26,7 @@ packages:
   gems:
     wanted:
       - progressbar
-      - aws-sdk
+      - minitest
     unwanted:
       - diff-lcs
       - kitchen-vagrant

test/integration/default/pips_spec.rb

@@ -4,7 +4,7 @@ control 'Wanted/Required python packages' do
 
   %w{
     dxpy
-    makerlabs
+    attrs
   }.each do |p|
     describe pip(p) do
       it { should be_installed }