summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-01-18 23:20:45 +0000
committerGerrit Code Review <review@openstack.org>2012-01-18 23:20:45 +0000
commitb2a5efcd050c98ef5c09db02fa06e75481d8e20e (patch)
tree27546ace85199721b6ecb115b93a6b65f8f9ff49 /nova/api
parentdc39e196373c90eacf48a236a6836c793f896312 (diff)
parent2cd3b86742c6f9c2452e4c1ac7dbd45fb92dd5b0 (diff)
downloadnova-b2a5efcd050c98ef5c09db02fa06e75481d8e20e.tar.gz
nova-b2a5efcd050c98ef5c09db02fa06e75481d8e20e.tar.xz
nova-b2a5efcd050c98ef5c09db02fa06e75481d8e20e.zip
Merge "disk_config extension now uses OS prefix."
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/openstack/compute/contrib/disk_config.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/contrib/disk_config.py b/nova/api/openstack/compute/contrib/disk_config.py
index 30aac0acc..cf78b847e 100644
--- a/nova/api/openstack/compute/contrib/disk_config.py
+++ b/nova/api/openstack/compute/contrib/disk_config.py
@@ -24,8 +24,8 @@ from nova.api.openstack import xmlutil
from nova import db
from nova import utils
-ALIAS = 'RAX-DCF'
-XMLNS_DCF = "http://docs.rackspacecloud.com/servers/api/ext/diskConfig/v1.0"
+ALIAS = 'OS-DCF'
+XMLNS_DCF = "http://docs.openstack.org/compute/ext/disk_config/api/v1.1"
API_DISK_CONFIG = "%s:diskConfig" % ALIAS
INTERNAL_DISK_CONFIG = "auto_disk_config"