From 00cfd2cc1135f49b73495a718162182114d975de Mon Sep 17 00:00:00 2001 From: Florian Haas Date: Wed, 17 Jul 2013 03:41:37 +0000 Subject: [PATCH] Don't include L3 agent on network nodes in single flat networks --- manifests/node/network.pp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/manifests/node/network.pp b/manifests/node/network.pp index 8f7c174..78db4a5 100644 --- a/manifests/node/network.pp +++ b/manifests/node/network.pp @@ -21,7 +21,9 @@ class kickstack::node::network inherits kickstack { if $amqp_host and $amqp_password and $quantum_keystone_password { include kickstack::quantum::agent::dhcp - include kickstack::quantum::agent::l3 + unless $::kickstack::quantum_network_type == 'single-flat' { + include kickstack::quantum::agent::l3 + } if $quantum_sql_conn { include kickstack::quantum::agent::l2 }