From ba674f3d91702bc2b9a92e636b6255f2afe0d2b5 Mon Sep 17 00:00:00 2001
From: Florian Haas <florian@hastexo.com>
Date: Fri, 19 Jul 2013 18:02:02 +0200
Subject: [PATCH] Ditch L2 configuration from controller node

---
 manifests/node/controller.pp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/manifests/node/controller.pp b/manifests/node/controller.pp
index 774dbdf..538d097 100644
--- a/manifests/node/controller.pp
+++ b/manifests/node/controller.pp
@@ -38,13 +38,4 @@ class kickstack::node::controller inherits kickstack {
     }
   }
 
-  # Including the Quantum L2 plugin _agent_ on
-  # the controller node makes no sense at all.
-  # Unfortunately though, the Quantum Puppet
-  # modules are wired in such a way that they
-  # require this. Until that is fixed, pull the
-  # L2 agent into the controller.
-  if $quantum_sql_conn and $quantum_keystone_password {
-    include kickstack::quantum::agent::l2::compute
-  }
 }