Merge lp:~pwlars/charms/trusty/jenkins-remote-slave/wifi-conf-location-change into lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk

[Paul Larson]

Depends on lp:~pwlars/ubuntu-test-cases/default-wifi-location
We already keep some other config things there, so it's a much more reasonable default than our previous location. I've already hand copied this on heymann, so that if the other branch lands first, it won't cause any problems.

[Para Siva (psivaa)]

review: Approve

=== modified file 'hooks/install.d/3000-ci-tools.sh'
--- hooks/install.d/3000-ci-tools.sh	2014-10-02 19:07:46 +0000
+++ hooks/install.d/3000-ci-tools.sh	2014-10-21 16:01:26 +0000
@@ -14,10 +14,7 @@
 udevadm control --reload-rules
 udevadm trigger
 
-#FIXME: 20140926 plars - find a better place for this
-# Existing tests assume /home/ubuntu/magners-wifi
-#https://app.asana.com/0/8312808705920/16730142900572
-cp files/secrets/wifi.conf /home/ubuntu/magners-wifi
+cp files/secrets/wifi.conf /home/jenkins/.ubuntu-ci/wifi.conf
 
 #Add jenkins to the utah group so that we can run utah tests without sudo
 addgroup jenkins utah