summaryrefslogtreecommitdiff
path: root/cloud-init-query.py
diff options
context:
space:
mode:
Diffstat (limited to 'cloud-init-query.py')
-rwxr-xr-xcloud-init-query.py23
1 files changed, 12 insertions, 11 deletions
diff --git a/cloud-init-query.py b/cloud-init-query.py
index 3e8c24ab..856cf462 100755
--- a/cloud-init-query.py
+++ b/cloud-init-query.py
@@ -2,8 +2,10 @@
# vi: ts=4 expandtab
#
# Copyright (C) 2009-2010 Canonical Ltd.
+# Copyright (C) 2012 Hewlett-Packard Development Company, L.P.
#
# Author: Scott Moser <scott.moser@canonical.com>
+# Author: Juerg Haefliger <juerg.haefliger@hp.com>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License version 3, as
@@ -20,28 +22,27 @@
import sys
import cloudinit
import cloudinit.CloudConfig
-import logging
-import os
-import traceback
-def Usage(out = sys.stdout):
+
+def Usage(out=sys.stdout):
out.write("Usage: %s name\n" % sys.argv[0])
-
+
+
def main():
# expect to be called with name of item to fetch
if len(sys.argv) != 2:
Usage(sys.stderr)
sys.exit(1)
- cc = cloudinit.CloudConfig.CloudConfig(cloudinit.cloud_config)
- cloud_config = cc.cfg
+ cfg_path = cloudinit.get_ipath_cur("cloud_config")
+ cc = cloudinit.CloudConfig.CloudConfig(cfg_path)
data = {
- 'user_data' : cc.cloud.get_userdata(),
- 'user_data_raw' : cc.cloud.get_userdata_raw(),
- 'instance_id' : cc.cloud.get_instance_id(),
+ 'user_data': cc.cloud.get_userdata(),
+ 'user_data_raw': cc.cloud.get_userdata_raw(),
+ 'instance_id': cc.cloud.get_instance_id(),
}
- name = sys.argv[1].replace('-','_')
+ name = sys.argv[1].replace('-', '_')
if name not in data:
sys.stderr.write("unknown name '%s'. Known values are:\n %s\n" %