From b77dd45006edd1f24a44d7c82d1fffb19d0f09f9 Mon Sep 17 00:00:00 2001
From: Endre Karlson <endre.karlson@gmail.com>
Date: Tue, 9 Oct 2012 15:29:45 +0200
Subject: [PATCH] Fix up some typos and options

---
 ...ntum_dhcp_agent.rb => quantum_dhcp_agent_config.rb} |  0
 ...{quantum_l3_agent.rb => quantum_l3_agent_config.rb} |  0
 manifests/agents/dhcp.pp                               | 10 +++++-----
 manifests/agents/l3.pp                                 | 10 +++++-----
 4 files changed, 10 insertions(+), 10 deletions(-)
 rename lib/puppet/type/{quantum_dhcp_agent.rb => quantum_dhcp_agent_config.rb} (100%)
 rename lib/puppet/type/{quantum_l3_agent.rb => quantum_l3_agent_config.rb} (100%)

diff --git a/lib/puppet/type/quantum_dhcp_agent.rb b/lib/puppet/type/quantum_dhcp_agent_config.rb
similarity index 100%
rename from lib/puppet/type/quantum_dhcp_agent.rb
rename to lib/puppet/type/quantum_dhcp_agent_config.rb
diff --git a/lib/puppet/type/quantum_l3_agent.rb b/lib/puppet/type/quantum_l3_agent_config.rb
similarity index 100%
rename from lib/puppet/type/quantum_l3_agent.rb
rename to lib/puppet/type/quantum_l3_agent_config.rb
diff --git a/manifests/agents/dhcp.pp b/manifests/agents/dhcp.pp
index 7115fd04b..df3caa307 100644
--- a/manifests/agents/dhcp.pp
+++ b/manifests/agents/dhcp.pp
@@ -1,16 +1,16 @@
-class quantum::agent::dhcp (
+class quantum::agents::dhcp (
   $state_path         = "/var/lib/quantum",
   $interface_driver   = "quantum.agent.linux.interface.OVSInterfaceDriver",
   $dhcp_driver        = "quantum.agent.linux.dhcp.Dnsmasq",
   $use_namespaces     = "False",
   $root_helper        = "sudo /usr/bin/quantum-rootwrap /etc/quantum/rootwrap.conf"
 ) inherits quantum {
-  Package["quantum-dhcp-agent"] -> Quantum_agent_dhcp_config<||>
+  Package["quantum-dhcp-agent"] -> Quantum_dhcp_agent_config<||>
   Quantum_config<||> ~> Service["quantum-dhcp-service"]
-  Quantum_gent_dhcp_config<||> ~> Service["quantum-dhcp-service"]
+  Quantum_dhcp_agent_config<||> ~> Service["quantum-dhcp-service"]
 
-  quantum_agent_dhcp_config {
-    "DEFAULT/debug"               value => $debug;
+  quantum_dhcp_agent_config {
+    "DEFAULT/debug":              value => $log_debug;
     "DEFAULT/state_path":         value => $state_path;
     "DEFAULT/interface_driver":   value => $interface_driver;
     "DEFAULT/dhcp_driver":        value => $dhcp_driver;
diff --git a/manifests/agents/l3.pp b/manifests/agents/l3.pp
index 965b74b33..6525e2f93 100644
--- a/manifests/agents/l3.pp
+++ b/manifests/agents/l3.pp
@@ -1,4 +1,4 @@
-class quantum::agent::l3 (
+class quantum::agents::l3 (
   $interface_driver         = "quantum.agent.linux.interface.OVSInterfaceDriver",
   $use_namespaces           = "False",
   $router_id                = "7e5c2aca-bbac-44dd-814d-f2ea9a4003e4",
@@ -7,12 +7,12 @@ class quantum::agent::l3 (
   $external_network_bridge  = "br-ex",
   $root_helper              = "sudo /usr/bin/quantum-rootwrap /etc/quantum/rootwrap.conf"
 ) inherits quantum {
-  Package["quantum-l3-agent"] -> Quantum_agent_l3_config<||>
+  Package["quantum-l3-agent"] -> Quantum_l3_agent_config<||>
   Quantum_config<||> ~> Service["quantum-l3-service"]
-  Quantum_agent_l3_config<||> ~> Service["quantum-l3-service"]
+  Quantum_l3_agent_config<||> ~> Service["quantum-l3-service"]
 
-  quantum_agent_l3_config {
-    "DEFAULT/debug"                     value => $debug;
+  quantum_l3_agent_config {
+    "DEFAULT/debug"                     value => $log_debug;
     "DEFAULT/auth_host":                value => $auth_host;
     "DEFAULT/auth_port":                value => $auth_port;
     "DEFAULT/auth_uri":                 value => $auth_uri;