summaryrefslogtreecommitdiffstats
path: root/bin/stack
diff options
context:
space:
mode:
authorTrey Morris <trey.morris@rackspace.com>2011-01-24 12:42:20 -0600
committerTrey Morris <trey.morris@rackspace.com>2011-01-24 12:42:20 -0600
commit303a8ee5bf3086d9b527ff7561b1ec426cff4597 (patch)
tree680655f6ddca816c5f56e905471fc7d881402a27 /bin/stack
parent00b029f60baca843487b3cfd89940ed65e85389a (diff)
parentbe58eddf4d254db3d225bfa3740cf4d19c7c22db (diff)
merged branch to name net_manager.create_networks args
Diffstat (limited to 'bin/stack')
-rwxr-xr-xbin/stack10
1 files changed, 7 insertions, 3 deletions
diff --git a/bin/stack b/bin/stack
index 7a6ce5960..25caca06f 100755
--- a/bin/stack
+++ b/bin/stack
@@ -22,6 +22,7 @@
import eventlet
eventlet.monkey_patch()
+import json
import os
import pprint
import sys
@@ -38,7 +39,6 @@ if os.path.exists(os.path.join(possible_topdir, 'nova', '__init__.py')):
sys.path.insert(0, possible_topdir)
import gflags
-from nova import utils
FLAGS = gflags.FLAGS
@@ -106,8 +106,12 @@ def do_request(controller, method, params=None):
'X-OpenStack-Project': FLAGS.project}
req = urllib2.Request(url, data, headers)
- resp = urllib2.urlopen(req)
- return utils.loads(resp.read())
+ try:
+ resp = urllib2.urlopen(req)
+ except urllib2.HTTPError, e:
+ print e.read()
+ sys.exit(1)
+ return json.loads(resp.read())
if __name__ == '__main__':