summaryrefslogtreecommitdiff
path: root/glanceclient/v2/shell.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-12 11:49:45 +0000
committerGerrit Code Review <review@openstack.org>2015-08-12 11:49:45 +0000
commit89b2dc58da0b227937a51df479d16e5917f0e7ef (patch)
tree229cb190d1f4d2647af88747c00343d7d4d0fb45 /glanceclient/v2/shell.py
parent9284eb42539630d6f46255a7ca10d7a718dc5f25 (diff)
parent3949e0e918e2501c4953a7d9beb58511688d84e1 (diff)
downloadpython-glanceclient-89b2dc58da0b227937a51df479d16e5917f0e7ef.tar.gz
Merge "Ship the default image schema in the client"
Diffstat (limited to 'glanceclient/v2/shell.py')
-rw-r--r--glanceclient/v2/shell.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/glanceclient/v2/shell.py b/glanceclient/v2/shell.py
index 5da4444..2f6122a 100644
--- a/glanceclient/v2/shell.py
+++ b/glanceclient/v2/shell.py
@@ -19,6 +19,7 @@ from glanceclient.common import progressbar
from glanceclient.common import utils
from glanceclient import exc
from glanceclient.v2 import image_members
+from glanceclient.v2 import image_schema
from glanceclient.v2 import images
from glanceclient.v2 import tasks
import json
@@ -36,6 +37,8 @@ def get_image_schema():
with open(schema_path, "r") as f:
schema_raw = f.read()
IMAGE_SCHEMA = json.loads(schema_raw)
+ else:
+ return image_schema._BASE_SCHEMA
return IMAGE_SCHEMA