From 35df6a4714996c0e40f0f32822d0568660bdf206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Charlier?= <francois.charlier@enovance.com>
Date: Mon, 5 Dec 2011 17:26:44 +0100
Subject: [PATCH] Fixes a typo preventing attaching RBD volumes.

A typo in spelling 'rbd' as 'rdb' prevents attaching RBD volumes
to instances.

Fixes bug 900359.

Change-Id: I872369a21b5935c37c4299f3f748d2d133a78bb3
---
 Authors                         | 1 +
 nova/virt/libvirt/connection.py | 2 +-
 nova/volume/manager.py          | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Authors b/Authors
index 9fc9954e4190..11e1daa8c16b 100644
--- a/Authors
+++ b/Authors
@@ -47,6 +47,7 @@ Eldar Nugaev <reldan@oscloud.ru>
 Eric Day <eday@oddments.org>
 Eric Windisch <eric@cloudscaling.com>
 Ewan Mellor <ewan.mellor@citrix.com>
+François Charlier <francois.charlier@enovance.com>
 Gabe Westmaas <gabe.westmaas@rackspace.com>
 Gary Kotton <garyk@radware.com>
 Hisaharu Ishii <ishii.hisaharu@lab.ntt.co.jp>
diff --git a/nova/virt/libvirt/connection.py b/nova/virt/libvirt/connection.py
index 93507f6c0876..c8618d735136 100644
--- a/nova/virt/libvirt/connection.py
+++ b/nova/virt/libvirt/connection.py
@@ -139,7 +139,7 @@ flags.DEFINE_list('libvirt_volume_drivers',
                   ['iscsi=nova.virt.libvirt.volume.LibvirtISCSIVolumeDriver',
                    'local=nova.virt.libvirt.volume.LibvirtVolumeDriver',
                    'fake=nova.virt.libvirt.volume.LibvirtFakeVolumeDriver',
-                   'rdb=nova.virt.libvirt.volume.LibvirtNetVolumeDriver',
+                   'rbd=nova.virt.libvirt.volume.LibvirtNetVolumeDriver',
                    'sheepdog=nova.virt.libvirt.volume.LibvirtNetVolumeDriver'],
                   'Libvirt handlers for remote volumes.')
 flags.DEFINE_string('default_local_format',
diff --git a/nova/volume/manager.py b/nova/volume/manager.py
index 4fb1fde26a85..3e1eac92e424 100644
--- a/nova/volume/manager.py
+++ b/nova/volume/manager.py
@@ -260,7 +260,7 @@ class VolumeManager(manager.SchedulerDependentManager):
         driver_volume_type: a string to identify the type of volume.  This
                            can be used by the calling code to determine the
                            strategy for connecting to the volume. This could
-                           be 'iscsi', 'rdb', 'sheepdog', etc.
+                           be 'iscsi', 'rbd', 'sheepdog', etc.
         data: this is the data that the calling code will use to connect
               to the volume. Keep in mind that this will be serialized to
               json in various places, so it should not contain any non-json