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

Proposed by Matthew Hart on 2013-09-16
Status: Merged
Approved by: Matthew Hart on 2013-09-16
Approved revision: 312
Merged at revision: 312
Proposed branch: lp:~matthew-hart/lava-lab/remove-url-mappings
Merge into: lp:lava-lab
Diff against target: 25 lines (+0/-10)
2 files modified
lava/init.sls (+0/-4)
lava/urlmappings.txt (+0/-6)
To merge this branch: bzr merge lp:~matthew-hart/lava-lab/remove-url-mappings
Reviewer Review Type Date Requested Status
Matthew Hart Approve on 2013-09-16
Review via email: mp+185740@code.launchpad.net

Description of the change

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.

To post a comment you must log in.
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lava/init.sls'
2--- lava/init.sls 2013-08-19 20:38:26 +0000
3+++ lava/init.sls 2013-09-16 09:27:19 +0000
4@@ -7,10 +7,6 @@
5 - sync_devices
6
7 {% for inst in salt['lava.list_instances']() %}
8-{{ inst }}/etc/lava-dispatcher/urlmappings.txt:
9- file.managed:
10- - source: salt://lava/urlmappings.txt
11-
12 {{ inst }}/etc/lava-dispatcher/device-types:
13 file.recurse:
14 - source: salt://lava/device-types
15
16=== removed file 'lava/urlmappings.txt'
17--- lava/urlmappings.txt 2013-05-28 21:15:24 +0000
18+++ lava/urlmappings.txt 1970-01-01 00:00:00 +0000
19@@ -1,6 +0,0 @@
20-^https:\/\/.*\/quantal\/restricted, scp://linaro-lava@snapshots.linaro.org/home/linaro-lava/snapshots.linaro.org/www/quantal/restricted/
21-^http:\/\/.*\/quantal\/restricted, scp://linaro-lava@snapshots.linaro.org/home/linaro-lava/snapshots.linaro.org/www/quantal/restricted/
22-^https:\/\/.*\/raring\/restricted, scp://linaro-lava@snapshots.linaro.org/home/linaro-lava/snapshots.linaro.org/www/raring/restricted/
23-^http:\/\/.*\/raring\/restricted, scp://linaro-lava@snapshots.linaro.org/home/linaro-lava/snapshots.linaro.org/www/raring/restricted/
24-^https:\/\/.*\/~linaro-android-restricted\/, scp://linaro-lava@snapshots.linaro.org/home/linaro-lava/snapshots.linaro.org/www/android/~linaro-android-restricted/
25-^http:\/\/.*\/~linaro-android-restricted\/, scp://linaro-lava@snapshots.linaro.org/home/linaro-lava/snapshots.linaro.org/www/android/~linaro-android-restricted/

Subscribers

People subscribed via source and target branches