Merge lp:~matthew-hart/lava-lab/remove-url-mappings into lp:lava-lab

[Matthew Hart]

Removed urlmappings.txt and the salt step for it.

We no longer need to rewrite http/restricted urls as the lab has a whitelisted IP and can fetch them over HTTP, which seems more reliable than SCP and can be cached.

[Matthew Hart (matthew-hart)]

review: Approve

=== modified file 'lava/init.sls'
--- lava/init.sls	2013-08-19 20:38:26 +0000
+++ lava/init.sls	2013-09-16 09:27:19 +0000
@@ -7,10 +7,6 @@
     - sync_devices
 
 {% for inst in salt['lava.list_instances']() %}
-{{ inst }}/etc/lava-dispatcher/urlmappings.txt:
-  file.managed:
-    - source: salt://lava/urlmappings.txt
-
 {{ inst }}/etc/lava-dispatcher/device-types:
   file.recurse:
     - source: salt://lava/device-types
 
=== removed file 'lava/urlmappings.txt'
--- lava/urlmappings.txt	2013-05-28 21:15:24 +0000
+++ lava/urlmappings.txt	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-^https:\/\/.*\/quantal\/restricted, scp://[e-mail]/home/linaro-lava/snapshots.linaro.org/www/quantal/restricted/
-^http:\/\/.*\/quantal\/restricted, scp://[e-mail]/home/linaro-lava/snapshots.linaro.org/www/quantal/restricted/
-^https:\/\/.*\/raring\/restricted, scp://[e-mail]/home/linaro-lava/snapshots.linaro.org/www/raring/restricted/
-^http:\/\/.*\/raring\/restricted, scp://[e-mail]/home/linaro-lava/snapshots.linaro.org/www/raring/restricted/
-^https:\/\/.*\/~linaro-android-restricted\/, scp://[e-mail]/home/linaro-lava/snapshots.linaro.org/www/android/~linaro-android-restricted/
-^http:\/\/.*\/~linaro-android-restricted\/, scp://[e-mail]/home/linaro-lava/snapshots.linaro.org/www/android/~linaro-android-restricted/