diff --git a/nova/meta/collectd.yml b/nova/meta/collectd.yml
index a0d3b10..5b92458 100644
--- a/nova/meta/collectd.yml
+++ b/nova/meta/collectd.yml
@@ -5,7 +5,7 @@
     interval: 60
     template: nova/files/collectd_libvirt.conf
 {%- endif %}
-{%- if pillar.nova.controller is defined %}
+{%- if pillar.nova.controller-do-not-run is defined %}
   nova_controller_nova:
     plugin: nova
     interval: 60
diff --git a/nova/meta/sphinx.yml b/nova/meta/sphinx.yml
index bf00db0..a2c72db 100644
--- a/nova/meta/sphinx.yml
+++ b/nova/meta/sphinx.yml
@@ -6,7 +6,9 @@
   {%- from "nova/map.jinja" import compute with context %}
     compute:
       name: compute
-      param: {}
+      param:
+        virtualization:
+          value: {{ compute.virtualization }}
   {%- endif %}
   {%- if pillar.nova.controller is defined %}
     controller: