summaryrefslogtreecommitdiff
path: root/cloudinit/config/cc_rightscale_userdata.py
diff options
context:
space:
mode:
authorBen Howard <ben.howard@canonical.com>2012-08-22 16:35:11 -0600
committerBen Howard <ben.howard@canonical.com>2012-08-22 16:35:11 -0600
commit6564861d44f843bb4e339db5691021ec7a95c511 (patch)
treed3f9f2fbc6e8e01bcab073f77b6f3d673a1da6be /cloudinit/config/cc_rightscale_userdata.py
parenta6752e739a0bb9052585b9b043ce1964bd77bb42 (diff)
parent56979d20b9c56c45bfbcaf93bc5f93fa505ece50 (diff)
downloadvyos-cloud-init-6564861d44f843bb4e339db5691021ec7a95c511.tar.gz
vyos-cloud-init-6564861d44f843bb4e339db5691021ec7a95c511.zip
Merge with lp:cloud-init
Diffstat (limited to 'cloudinit/config/cc_rightscale_userdata.py')
-rw-r--r--cloudinit/config/cc_rightscale_userdata.py4
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]