Merge "supporting lxc cpu mode Fixing the default cpu_mode from None to none"

This commit is contained in:
Jenkins
2014-12-23 03:04:54 +00:00
committed by Gerrit Code Review

View File

@@ -19,9 +19,9 @@
#
# [*libvirt_cpu_mode*]
# (optional) The libvirt CPU mode to configure. Possible values
# include custom, host-model, None, host-passthrough.
# include custom, host-model, none, host-passthrough.
# Defaults to 'host-model' if libvirt_virt_type is set to either
# kvm or qemu, otherwise defaults to 'None'.
# kvm or qemu, otherwise defaults to 'none'.
#
# [*libvirt_disk_cachemodes*]
# (optional) A list of cachemodes for different disk types, e.g.
@@ -88,7 +88,7 @@ class nova::compute::libvirt (
$libvirt_cpu_mode_real = 'host-model'
}
default: {
$libvirt_cpu_mode_real = 'None'
$libvirt_cpu_mode_real = 'none'
}
}
} else {