diff options
author | Scott Moser <smoser@ubuntu.com> | 2012-08-22 14:26:35 -0400 |
---|---|---|
committer | Scott Moser <smoser@ubuntu.com> | 2012-08-22 14:26:35 -0400 |
commit | 0bc9f3aad55b6b1d50f80ef1b1688c2ceb1c8a84 (patch) | |
tree | 84509440ef196e5741ece308a7f806d660accbda /cloudinit/config/cc_rightscale_userdata.py | |
parent | 26dd7461ce7ce9a6cba541ece94b802df772168b (diff) | |
parent | 451e48732ff7885502db2f8296777fa58b670f3b (diff) | |
download | vyos-cloud-init-0bc9f3aad55b6b1d50f80ef1b1688c2ceb1c8a84.tar.gz vyos-cloud-init-0bc9f3aad55b6b1d50f80ef1b1688c2ceb1c8a84.zip |
merge from trunk for pep8 fixes
Diffstat (limited to 'cloudinit/config/cc_rightscale_userdata.py')
-rw-r--r-- | cloudinit/config/cc_rightscale_userdata.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cloudinit/config/cc_rightscale_userdata.py b/cloudinit/config/cc_rightscale_userdata.py index 45d41b3f..4bf18516 100644 --- a/cloudinit/config/cc_rightscale_userdata.py +++ b/cloudinit/config/cc_rightscale_userdata.py @@ -37,9 +37,9 @@ import os +from cloudinit.settings import PER_INSTANCE from cloudinit import url_helper as uhelp from cloudinit import util -from cloudinit.settings import PER_INSTANCE from urlparse import parse_qs @@ -72,7 +72,7 @@ def handle(name, _cfg, cloud, log, _args): captured_excps = [] # These will eventually be then ran by the cc_scripts_user - # TODO: maybe this should just be a new user data handler?? + # TODO(harlowja): maybe this should just be a new user data handler?? # Instead of a late module that acts like a user data handler? scripts_d = cloud.get_ipath_cur('scripts') urls = mdict[MY_HOOKNAME] |