| commit | c0dea9789b1d6133624444b99b9c9e6b7c09714f | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Wed Mar 12 17:08:31 2014 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Wed Mar 12 17:08:31 2014 +0000 |
| tree | cd427e5ff6ec4af9531680b8184d214450ee85c5 | |
| parent | 63d06bcad9b6716fc4c4f69d52a83ccd40d160b2 [diff] | |
| parent | a99b869d3c14b33d0cf59877f3ae60686763f8ae [diff] |
Merge "Do not restart libvirt if n-cpu is disabled"
diff --git a/lib/nova b/lib/nova index 55103e8..a1f49dc 100644 --- a/lib/nova +++ b/lib/nova
@@ -308,7 +308,7 @@ # Rebuild the config file from scratch create_nova_conf - if [[ -r $NOVA_PLUGINS/hypervisor-$VIRT_DRIVER ]]; then + if is_service_enabled n-cpu && [[ -r $NOVA_PLUGINS/hypervisor-$VIRT_DRIVER ]]; then # Configure hypervisor plugin configure_nova_hypervisor fi