Pushed with the interdiff applied. Thanks, Thomas
On Mon, Oct 7, 2013 at 11:32 AM, Santi Raffa <[email protected]> wrote: > I'm sorry, somebody is having a case of the Mondays and that somebody is > me. > > Interdiff: > diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py > index eb6d56d..c8ec34f 100644 > --- a/lib/hypervisor/hv_kvm.py > +++ b/lib/hypervisor/hv_kvm.py > @@ -1150,7 +1150,7 @@ class KVMHypervisor(hv_base.BaseHypervisor): > boot_val = ",boot=on" > > access_mode = cfdev.params.get(constants.LDP_ACCESS, > - constants.KERNELSPACE) > + constants.DISK_KERNELSPACE) > if access_mode == constants.DISK_USERSPACE: > drive_uri = device.GetUserspaceAccessUri(constants.HT_KVM) > else: > > > On Mon, Oct 7, 2013 at 11:27 AM, Raffa Santi <[email protected]> wrote: > > Hardcode constants.KERNELSPACE as the default access method for > > KVM disk templates, rather than allowing a change to the RBD default > > access mode to affect all disk templates for KVM. > > > > At some point in the future it might make more sense to have this > > value as its own constant, but as it stands it makes little sense: > > only one of several disk templates and one of several hypervisors > > support an userspace option to begin with. > > > > Signed-off-by: Raffa Santi <[email protected]> > > --- > > lib/hypervisor/hv_kvm.py | 6 ++---- > > 1 file changed, 2 insertions(+), 4 deletions(-) > > > > diff --git a/lib/hypervisor/hv_kvm.py b/lib/hypervisor/hv_kvm.py > > index d7cdec7..eb6d56d 100644 > > --- a/lib/hypervisor/hv_kvm.py > > +++ b/lib/hypervisor/hv_kvm.py > > @@ -1149,10 +1149,8 @@ class KVMHypervisor(hv_base.BaseHypervisor): > > if needs_boot_flag and disk_type != constants.HT_DISK_IDE: > > boot_val = ",boot=on" > > > > - access_mode = cfdev.params.get( > > - constants.LDP_ACCESS, > > - > constants.DISK_LD_DEFAULTS[constants.DT_RBD][constants.LDP_ACCESS] > > - ) > > + access_mode = cfdev.params.get(constants.LDP_ACCESS, > > + constants.KERNELSPACE) > > if access_mode == constants.DISK_USERSPACE: > > drive_uri = device.GetUserspaceAccessUri(constants.HT_KVM) > > else: > > -- > > 1.8.4 > > > > > > -- > Raffa Santi > Google Germany GmbH > Dienerstr. 12 > 80331 München > > > Registergericht und -nummer: Hamburg, HRB 86891 > Sitz der Gesellschaft: Hamburg > Geschäftsführer: Graham Law, Christine Elizabeth Flores > -- Thomas Thrainer | Software Engineer | [email protected] | Google Germany GmbH Dienerstr. 12 80331 München Registergericht und -nummer: Hamburg, HRB 86891 Sitz der Gesellschaft: Hamburg Geschäftsführer: Graham Law, Christine Elizabeth Flores
