Merge pull request #135 from cbuben/issue-944

Merged automatically by jenkins after successful build test
rcbops-cookbooks · May 24, 2014 · 5e5140b · 5e5140b
2 parents 3c1cad9 + 2429740
commit 5e5140b
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/attributes/default.rb b/attributes/default.rb
@@ -63,6 +63,8 @@
 default["rpcdaemon"]["queue_expire"] = 60
 # quantum API timeouts
 default["rpcdaemon"]["timeout"] = 20
+# which plugins should be enabled
+default["rpcdaemon"]["enabled_plugins"] = ["L3Agent", "DHCPAgent"]
 
 # ######################################################################### #
 # Neutron Configuration Attributes

diff --git a/recipes/rpcdaemon.rb b/recipes/rpcdaemon.rb
@@ -30,7 +30,8 @@
     "rabbit_ipaddress" => rabbit_info["host"],
     "check_interval" => node["rpcdaemon"]["check_interval"],
     "queue_expire" => node["rpcdaemon"]["queue_expire"],
-    "timeout" => node["rpcdaemon"]["timeout"]
+    "timeout" => node["rpcdaemon"]["timeout"],
+    "enabled_plugins" => node["rpcdaemon"]["enabled_plugins"]
   )
 end
 

diff --git a/templates/default/rpcdaemon.conf.erb b/templates/default/rpcdaemon.conf.erb
@@ -1,7 +1,7 @@
 [Daemon]
 # Space-separated list of plugins to load
 # Available plugins: L3Agent, DHCPAgent, Dump
-plugins = L3Agent DHCPAgent
+plugins = <%= @enabled_plugins.join(' ') %>
 
 # Rabbit server IP
 rpchost = <%= @rabbit_ipaddress %>