diff options
| author | Scott Moser <smoser@ubuntu.com> | 2013-03-20 08:35:24 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2013-03-20 08:35:24 -0400 |
| commit | 41190448decad51cf76a85d727e6935a8a206cca (patch) | |
| tree | f4548e8595cafff2ffc13d914dbadef7b8c737db /cloudinit/config/cc_phone_home.py | |
| parent | f8318f8eec9c8f1c1676ce6a5b5c2c77fa2f7cc5 (diff) | |
| parent | ab71760d7e127ae9a3cf31a4f6d7600c945f0dd7 (diff) | |
| download | vyos-cloud-init-41190448decad51cf76a85d727e6935a8a206cca.tar.gz vyos-cloud-init-41190448decad51cf76a85d727e6935a8a206cca.zip | |
use 'requests' rather than urllib2.
This re-works the urlhelper and users of it to use requests rather
than urllib2. The primary benefit is that now when using recent
versions of python-requests (>= 0.8.8) https certificates will be checked.
Diffstat (limited to 'cloudinit/config/cc_phone_home.py')
| -rw-r--r-- | cloudinit/config/cc_phone_home.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cloudinit/config/cc_phone_home.py b/cloudinit/config/cc_phone_home.py index 886487f8..c873c8a8 100644 --- a/cloudinit/config/cc_phone_home.py +++ b/cloudinit/config/cc_phone_home.py @@ -19,7 +19,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. from cloudinit import templater -from cloudinit import url_helper as uhelp from cloudinit import util from cloudinit.settings import PER_INSTANCE @@ -112,7 +111,9 @@ def handle(name, cfg, cloud, log, args): } url = templater.render_string(url, url_params) try: - uhelp.readurl(url, data=real_submit_keys, retries=tries, sec_between=3) + util.read_file_or_url(url, data=real_submit_keys, + retries=tries, sec_between=3, + ssl_details=util.fetch_ssl_details(cloud.paths)) except: util.logexc(log, ("Failed to post phone home data to" " %s in %s tries"), url, tries) |