diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index eaefdb60b..0d85b9076 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -209,6 +209,9 @@ function start_monasca_services {
         if [ -f /etc/systemd/system/monasca-agent.service ]; then
             start_service monasca-agent.service || restart_service monasca-agent.service
         fi
+        if is_service_enabled nova && [ "$VIRT_DRIVER" = "libvirt" ]; then
+            sudo /opt/monasca-agent/bin/monasca-setup -d libvirt
+        fi
     fi
 }
 
@@ -847,7 +850,7 @@ function configure_monasca_api_python {
         iniset "$MONASCA_API_CONF" security default_authorized_roles "monasca-user"
         iniset "$MONASCA_API_CONF" security agent_authorized_roles "monasca-agent"
         iniset "$MONASCA_API_CONF" security read_only_authorized_roles "monasca-read-only-user"
-        iniset "$MONASCA_API_CONF" security delegate_authorized_roles "admin"
+        iniset "$MONASCA_API_CONF" security delegate_authorized_roles "monasca-agent"
 
         # server setup
         iniset "$MONASCA_API_PASTE_INI" server:main host $MONASCA_API_SERVICE_HOST
@@ -1114,6 +1117,12 @@ function install_monasca_agent {
 
         apt_get install python-yaml libxml2-dev libxslt1-dev
 
+        MONASCA_AGENT_EXTRAS="kafka_plugin"
+        if is_service_enabled nova && [ "$VIRT_DRIVER" = "libvirt" ]; then
+            apt_get install libvirt-dev
+            MONASCA_AGENT_EXTRAS=${MONASCA_AGENT_EXTRAS},libvirt
+        fi
+
         git_clone $MONASCA_CLIENT_REPO $MONASCA_CLIENT_DIR $MONASCA_CLIENT_BRANCH
         git_clone $MONASCA_AGENT_REPO $MONASCA_AGENT_DIR $MONASCA_AGENT_BRANCH
 
@@ -1129,7 +1138,7 @@ function install_monasca_agent {
 
         PIP_VIRTUAL_ENV=/opt/monasca-agent
 
-        setup_install $MONASCA_AGENT_DIR kafka_plugin
+        setup_install $MONASCA_AGENT_DIR $MONASCA_AGENT_EXTRAS
         setup_dev_lib "python-monascaclient"
 
         unset PIP_VIRTUAL_ENV