diff --git a/Gemfile b/Gemfile
index 1fab60854..a44e340a0 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,6 +4,7 @@ group :development, :test, :system_tests do
   gem 'puppet-openstack_spec_helper',
       :git     => 'https://git.openstack.org/openstack/puppet-openstack_spec_helper',
       :require => false
+  gem 'fast_gettext', ['< 1.2.0']
 end
 
 if facterversion = ENV['FACTER_GEM_VERSION']
diff --git a/install_modules.sh b/install_modules.sh
index 3148707b4..2beb5ecce 100755
--- a/install_modules.sh
+++ b/install_modules.sh
@@ -22,6 +22,8 @@ source $SCRIPT_DIR/functions
 
 print_header 'Start (install_modules.sh)'
 print_header 'Install r10k'
+# fast_gettext 1.2.0+ requires ruby 2.1.0
+gem install fast_gettext -v '< 1.2.0'
 gem install r10k --no-ri --no-rdoc
 
 # make sure there is no puppet module pre-installed
diff --git a/manifests/nova.pp b/manifests/nova.pp
index 5e4150085..acafd3809 100644
--- a/manifests/nova.pp
+++ b/manifests/nova.pp
@@ -9,6 +9,11 @@
 #   (optional) Libvirt domain type. Options are: kvm, lxc, qemu, uml, xen
 #   Defaults to 'qemu'
 #
+# [*libvirt_cpu_mode*]
+#   (optional) The libvirt CPU mode to configure.
+#   Possible values include custom, host-model, none, host-passthrough.
+#   Defaults to 'none'
+#
 # [*volume_encryption*]
 #   (optional) Boolean to configure or not volume encryption
 #   Defaults to false.
@@ -16,6 +21,7 @@
 class openstack_integration::nova (
   $libvirt_rbd       = false,
   $libvirt_virt_type = 'qemu',
+  $libvirt_cpu_mode  = 'none',
   $volume_encryption = false,
 ) {
 
@@ -121,6 +127,7 @@ class openstack_integration::nova (
   }
   class { '::nova::compute::libvirt':
     libvirt_virt_type     => $libvirt_virt_type,
+    libvirt_cpu_mode      => $libvirt_cpu_mode,
     migration_support     => true,
     vncserver_listen      => '0.0.0.0',
     # TODO: enable it again when puppet 4.5 will be idempotent