Use pkgrepo for Salt

This is part of a patch series to standardize our Salt installations.

.travis/install_salt

@@ -11,7 +11,7 @@ install_salt () {
         # Don't autostart services
         printf '#!/bin/sh\nexit 101\n' | sudo install -m 755 /dev/stdin /usr/sbin/policy-rc.d
         curl https://repo.saltstack.com/apt/ubuntu/14.04/amd64/archive/2015.5.8/SALTSTACK-GPG-KEY.pub | sudo apt-key add -
-        printf 'deb http://repo.saltstack.com/apt/ubuntu/14.04/amd64/archive/2015.5.8 trusty main\n' | sudo tee -a /etc/apt/sources.list >/dev/null
+        printf 'deb http://repo.saltstack.com/apt/ubuntu/14.04/amd64/archive/2015.5.8 trusty main\n' | sudo tee /etc/apt/sources.list.d/saltstack.list >/dev/null
         sudo apt-get -y update
         sudo apt-get -y install salt-minion=2015.5.8+ds-1
     elif [ "${OS_NAME}" = "osx" ]; then

salt/common.sls

@@ -0,0 +1,16 @@
+{% from tpldir ~ '/map.jinja' import salt %}
+
+{% if grains['os'] == 'Ubuntu' %}
+salt:
+  pkgrepo.managed:
+    - name: 'deb http://repo.saltstack.com/apt/ubuntu/14.04/amd64/archive/{{ salt.version }} trusty main'
+    - file: /etc/apt/sources.list.d/saltstack.list
+    - key_url: https://repo.saltstack.com/apt/ubuntu/14.04/amd64/archive/{{ salt.version }}/SALTSTACK_GPG_KEY.pub
+
+/etc/apt/sources.list.d/saltstack.list:
+  file.exists:
+    - require:
+      - pkgrepo: salt
+    - require_in:
+      - file: /etc/apt/sources.list.d
+{% endif %}

salt/map.jinja

@@ -0,0 +1,10 @@
+{%
+  set salt = salt.grains.filter_by({
+      'defaults': {
+        'version':  '2015.5.8'
+      },
+    },
+    base='defaults',
+    merge=salt.pillar.get('salt', {})
+  )
+%}

top.sls

@@ -4,6 +4,7 @@ base:
   '*':
     - common
     - servo-dependencies
+    - salt.common
 
   'os:Ubuntu':
     - match: grain