diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index d39c9c278..3fc575c13 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -147,6 +147,11 @@ function configure_vitrage {
         disable_vitrage_datasource aodh
     fi
 
+    # remove nagios vitrage datasource if nagios datasource not installed
+    if [ "$VITRAGE_USE_NAGIOS" == "False" ]; then
+        disable_vitrage_datasource nagios
+    fi
+
     # copy the mock sample files
     cp $VITRAGE_DIR/etc/vitrage/*.sample.json $VITRAGE_CONF_DIR
 
diff --git a/devstack/settings b/devstack/settings
index 9f44adabe..e5630bb0e 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -20,6 +20,10 @@ VITRAGE_SERVICE_PROTOCOL=http
 VITRAGE_SERVICE_HOST=$SERVICE_HOST
 VITRAGE_SERVICE_PORT=${VITRAGE_SERVICE_PORT:-8999}
 VITRAGE_USE_MOD_WSGI=${VITRAGE_USE_MOD_WSGI:-${ENABLE_HTTPD_MOD_WSGI_SERVICES}}
+
+# Toggle for deploying Vitrage with/without nagios
+VITRAGE_USE_NAGIOS=$(trueorfalse False VITRAGE_USE_NAGIOS)
+
 VITRAGE_DEFAULT_DATASOURCES=${VITRAGE_DEFAULT_DATASOURCES:-nova.host,nova.instance,nova.zone,nagios,static_physical,aodh,cinder.volume,neutron.network,neutron.port}