From 6f76b4f9794af32ab27125cf6fbd44710858cdac Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Thu, 1 Nov 2012 23:31:23 -0700
Subject: [PATCH] quantum updates

- do not make quantum the default config
- update params to reflect latest quantum module
---
 manifests/all.pp             |  4 ++--
 manifests/compute.pp         | 21 +++++++++++++++++----
 manifests/controller.pp      |  7 ++++++-
 manifests/nova/controller.pp | 35 ++++++++++++++++++++++++++++++-----
 4 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/manifests/all.pp b/manifests/all.pp
index d2003f0..9c4b403 100644
--- a/manifests/all.pp
+++ b/manifests/all.pp
@@ -271,11 +271,10 @@ class openstack::all (
       rabbit_host     => '127.0.0.1',
       rabbit_user     => $rabbit_user,
       rabbit_password => $rabbit_password,
-      sql_connection  => $quantum_sql_connection,
     }
 
     class { 'quantum::server':
-      keystone_password => $quantum_user_password,
+      auth_password => $quantum_user_password,
     }
 
     class { 'quantum::agents::dhcp': }
@@ -292,6 +291,7 @@ class openstack::all (
       tenant_network_type => 'gre',
       # I need to know what this does...
       local_ip            => '10.0.0.1',
+      enable_tunneling    => true,
     }
 
     class { 'quantum::agents::ovs':
diff --git a/manifests/compute.pp b/manifests/compute.pp
index 618ebef..a791adf 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -32,7 +32,7 @@ class openstack::compute (
   $network_config                = {},
   $multi_host                    = false,
   # Quantum
-  $quantum                       = true,
+  $quantum                       = false,
   $quantum_sql_connection        = false,
   $quantum_host                  = false,
   $quantum_user_password         = false,
@@ -171,14 +171,27 @@ class openstack::compute (
       rabbit_host     => $rabbit_host,
       rabbit_user     => $rabbit_user,
       rabbit_password => $rabbit_password,
-      sql_connection  => $quantum_sql_connection,
+      #sql_connection  => $quantum_sql_connection,
+    }
+
+    class { 'quantum::plugins::ovs':
+      tenant_network_type => 'gre',
+      enable_tunneling    => true,
     }
 
     class { 'quantum::agents::ovs':
-      bridge_uplinks => ["br-virtual:${private_interface}"],
+      bridge_uplinks   => ["br-virtual:${private_interface}"],
+      enable_tunneling => true,
+      local_ip         => $internal_address,
     }
 
-    class { 'quantum::agents::dhcp': }
+    class { 'quantum::agents::dhcp':
+      use_namespaces => False,
+    }
+
+    class { 'quantum::agents::l3':
+      auth_password => $quantum_user_password,
+    }
 
     class { 'nova::compute::quantum': }
 
diff --git a/manifests/controller.pp b/manifests/controller.pp
index 26432d7..0cae84d 100644
--- a/manifests/controller.pp
+++ b/manifests/controller.pp
@@ -131,7 +131,7 @@ class openstack::controller (
   $cinder_db_user          = 'cinder',
   $cinder_db_dbname        = 'cinder',
   # quantum
-  $quantum                 = true,
+  $quantum                 = false,
   $quantum_db_user         = 'quantum',
   $quantum_db_dbname       = 'quantum',
   $enabled                 = true
@@ -253,7 +253,12 @@ class openstack::controller (
     multi_host              => $multi_host,
     public_interface        => $public_interface,
     private_interface       => $private_interface,
+    # Quantum
     quantum                 => $quantum,
+    quantum_user_password   => $quantum_user_password,
+    quantum_db_password     => $quantum_db_password,
+    quantum_db_user         => $quantum_db_user,
+    quantum_db_dbname       => $quantum_db_dbname,
     # Nova
     nova_user_password      => $nova_user_password,
     nova_db_password        => $nova_db_password,
diff --git a/manifests/nova/controller.pp b/manifests/nova/controller.pp
index 20b6822..565e67e 100644
--- a/manifests/nova/controller.pp
+++ b/manifests/nova/controller.pp
@@ -42,7 +42,12 @@ class openstack::nova::controller (
   $multi_host                = false,
   $public_interface          = undef,
   $private_interface         = undef,
-  $quantum                   = true,
+  # quantum
+  $quantum                   = false,
+  $quantum_db_dbname         = 'quantum',
+  $quantum_db_user           = 'quantum',
+  $quantum_db_password       = 'quantum_pass',
+  $quantum_user_password     = 'quantum_pass',
   # Nova
   $nova_db_user              = 'nova',
   $nova_db_dbname            = 'nova',
@@ -140,21 +145,41 @@ class openstack::nova::controller (
     class { 'quantum':
       rabbit_user     => $rabbit_user,
       rabbit_password => $rabbit_password,
-      sql_connection  => $quantum_sql_connection,
+      #sql_connection  => $quantum_sql_connection,
       verbose         => $verbose,
+      debug           => $verbose,
     }
 
     class { 'quantum::server':
-      keystone_password => $quantum_user_password,
+      auth_password => $quantum_user_password,
     }
 
     class { 'quantum::plugins::ovs':
       sql_connection      => $quantum_sql_connection,
       tenant_network_type => 'gre',
-      # I need to know what this does...
-      local_ip            => '10.0.0.1',
+      enable_tunneling    => true,
     }
 
+    class { 'quantum::agents::ovs':
+      bridge_uplinks   => ["br-virtual:${private_interface}"],
+      enable_tunneling => true,
+      local_ip         => $internal_address,
+    }
+
+    class { 'quantum::agents::dhcp':
+      use_namespaces => False,
+    }
+
+
+#    class { 'quantum::agents::dhcp':
+#      use_namespaces => False,
+#    }
+#
+#
+#    class { 'quantum::agents::l3':
+#      auth_password => $quantum_user_password,
+#    }
+
     class { 'nova::network::quantum':
     #$fixed_range,
       quantum_admin_password    => $quantum_user_password,