use backports instead of unstable for salt-mininon (closes #152515)
authorPaul Tonelli <paul.tonelli@logilab.fr>
Tue, 16 Jul 2013 11:13:51 +0200
changeset 179 dde619dd74ea
parent 178 35610e3611e3
child 180 fe8b24630837
use backports instead of unstable for salt-mininon (closes #152515)
ami_pre/files.sls
others/backports.list
others/unstable.list
--- a/ami_pre/files.sls	Tue Jul 16 11:53:36 2013 +0200
+++ b/ami_pre/files.sls	Tue Jul 16 11:13:51 2013 +0200
@@ -43,8 +43,7 @@
             - cmd.run: salt_ppa
 {% endif %}
 {% if 'ami.type' in grains and grains['ami.type'] == 'debian' %}
-            - file.managed: unstable.list
-            - file.managed: pinning 
+            - file.managed: backports.list
 {% endif %}
 
 chroot_install_salt:
@@ -68,21 +67,14 @@
 {% endif %}
 
 {% if 'ami.type' in grains and grains['ami.type'] == 'debian' %}
-unstable.list:
+backports.list:
     file.managed:
-        - name: /mnt/variation/etc/apt/sources.list.d/unstable.list
-        - source: salt://others/unstable.list
+        - name: /mnt/variation/etc/apt/sources.list.d/backports.list
+        - source: salt://others/backports.list
         - mode: 644
         - require:
             - mount.mounted: mounted_variation
 
-pinning:
-    file.managed:
-        - name: /mnt/variation/etc/apt/preferences.d/pinning
-        - source: salt://others/pinning
-        - mode: 644
-        - require:
-            - mount.mounted: mounted_variation
 {% endif %}
 
 {% if 'ami.type' in grains and grains['ami.type'] == 'centos5' %}
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/others/backports.list	Tue Jul 16 11:13:51 2013 +0200
@@ -0,0 +1,3 @@
+deb http://http.debian.net/debian/ wheezy-backports main
+deb-src http://http.debian.net/debian/ wheezy-backports main
+
--- a/others/unstable.list	Tue Jul 16 11:53:36 2013 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-deb http://http.debian.net/debian unstable main
-deb-src http://http.debian.net/debian unstable main
-