From: Sascha Peilicke <saschpe@mailbox.org>
Date: Tue, 11 Mar 2014 14:50:38 +0000 (+0100)
Subject: Add missing config values for vmwware_vmdk test
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2a20befd8f300b3970c20677da2d210c0ed85d17;p=openstack-build%2Fcinder-build.git

Add missing config values for vmwware_vmdk test

Import CONF.glance_api_version from cinder.common.config

Closes-Bug: 1290883
Change-Id: I9f64c2f60efe517ad8e4ee2a98ed8da4be257b47
---

diff --git a/cinder/image/glance.py b/cinder/image/glance.py
index aca124387..79af5703f 100644
--- a/cinder/image/glance.py
+++ b/cinder/image/glance.py
@@ -44,6 +44,7 @@ glance_opts = [
 ]
 CONF = cfg.CONF
 CONF.register_opts(glance_opts)
+CONF.import_opt('glance_api_version', 'cinder.common.config')
 
 LOG = logging.getLogger(__name__)