From 49e64884db4d86fdf4c9662abdcbc9f32940e0fc Mon Sep 17 00:00:00 2001
From: Dan Bode <dan@puppetlabs.com>
Date: Sun, 28 Oct 2012 21:22:05 -0700
Subject: [PATCH] change controller params

- make cinder the default
- reorganize params
- have fewer default passwords
---
 manifests/all.pp        | 41 +++++++++++++++++++++++------------------
 manifests/controller.pp | 13 ++++++++-----
 2 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/manifests/all.pp b/manifests/all.pp
index 74aebbf..344ea2b 100644
--- a/manifests/all.pp
+++ b/manifests/all.pp
@@ -57,34 +57,44 @@
 #
 #
 class openstack::all (
-  # Network Required
+  # Required Network
   $public_address,
-  $public_interface        = 'eth0',
-  $private_interface       = 'eth1',
+  $public_interface,
+  $private_interface,
+  $admin_email,
+  # required password
+  $mysql_root_password,
+  $admin_password,
+  $rabbit_password,
+  $keystone_db_password,
+  $keystone_admin_token,
+  $glance_db_password,
+  $glance_user_password,
+  $nova_db_password,
+  $nova_user_password,
+  $secret_key,
+  $internal_address = '127.0.0.1',
+  # cinder and quantum password are not required b/c they are
+  # optional. Not sure what to do about this.
+  $cinder_user_password    = 'cinder_pass',
+  $cinder_db_password      = 'cinder_pass',
+  $quantum_user_password   = 'quantum_pass',
+  $quantum_db_password     = 'quantum_pass',
   # Database
-  $mysql_root_password     = 'sql_pass',
   $db_type                 = 'mysql',
   $mysql_account_security  = true,
   $allowed_hosts           = ['127.0.0.%'],
   # Keystone
-  $admin_email             = 'some_user@some_fake_email_address.foo',
-  $admin_password          = 'ChangeMe',
-  $keystone_db_password    = 'keystone_pass',
   $keystone_db_user        = 'keystone',
   $keystone_db_dbname      = 'keystone',
-  $keystone_admin_token    = 'keystone_admin_token',
   $keystone_admin_tenant   = 'admin',
   $region                  = 'RegionOne',
   # Glance Required
-  $glance_db_password      = 'glance_pass',
   $glance_db_user          = 'glance',
   $glance_db_dbname        = 'glance',
-  $glance_user_password    = 'glance_pass',
   # Nova
-  $nova_db_password        = 'nova_pass',
   $nova_db_user            = 'nova',
   $nova_db_dbname          = 'nova',
-  $nova_user_password      = 'nova_pass',
   $purge_nova_config       = true,
   # Network
   $network_manager         = 'nova.network.manager.FlatDHCPManager',
@@ -96,25 +106,19 @@ class openstack::all (
   $network_config          = {},
   $quantum                 = true,
   # Rabbit
-  $rabbit_password         = 'rabbit_pw',
   $rabbit_user             = 'nova',
   # Horizon
-  $secret_key              = 'dummy_secret_key',
   $cache_server_ip         = '127.0.0.1',
   $cache_server_port       = '11211',
   $swift                   = false,
   $horizon_app_links       = undef,
   # if the cinder management components should be installed
   $cinder                  = true,
-  $cinder_user_password    = 'cinder_user_pass',
-  $cinder_db_password      = 'cinder_db_pass',
   $cinder_db_user          = 'cinder',
   $cinder_db_dbname        = 'cinder',
   $volume_group            = 'cinder-volumes',
   $cinder_test             = false,
   #
-  $quantum_user_password   = 'quantum_user_pass',
-  $quantum_db_password     = 'quantum_db_pass',
   $quantum_db_user         = 'quantum',
   $quantum_db_dbname       = 'quantum',
   # Virtaulization
@@ -159,6 +163,7 @@ class openstack::all (
       quantum_db_password    => $quantum_db_password,
       quantum_db_dbname      => $quantum_db_dbname,
       allowed_hosts          => $allowed_hosts,
+      enabled                => $enabled,
     }
   }
 
diff --git a/manifests/controller.pp b/manifests/controller.pp
index be1eb45..26432d7 100644
--- a/manifests/controller.pp
+++ b/manifests/controller.pp
@@ -114,7 +114,6 @@ class openstack::controller (
   $multi_host              = false,
   $auto_assign_floating_ip = false,
   $network_config          = {},
-  $quantum                 = true,
   # Rabbit
   $rabbit_user             = 'nova',
   # Horizon
@@ -126,11 +125,13 @@ class openstack::controller (
   $vnc_enabled             = true,
   # General
   $verbose                 = 'False',
+  # cinder
   # if the cinder management components should be installed
-  $cinder                  = false,
+  $cinder                  = true,
   $cinder_db_user          = 'cinder',
   $cinder_db_dbname        = 'cinder',
-  #
+  # quantum
+  $quantum                 = true,
   $quantum_db_user         = 'quantum',
   $quantum_db_dbname       = 'quantum',
   $enabled                 = true
@@ -144,7 +145,7 @@ class openstack::controller (
   if $admin_address {
     $admin_address_real = $admin_address
   } else {
-    $admin_address_real = $public_address
+    $admin_address_real = $internal_address_real
   }
 
   # Ensure things are run in order
@@ -182,6 +183,8 @@ class openstack::controller (
       allowed_hosts          => $allowed_hosts,
       enabled                => $enabled,
     }
+  } else {
+    fail("Unsupported db : ${db_type}")
   }
 
   ####### KEYSTONE ###########
@@ -198,7 +201,7 @@ class openstack::controller (
     admin_password        => $admin_password,
     public_address        => $public_address,
     internal_address      => $internal_address_real,
-    admin_address         => $admin_address,
+    admin_address         => $admin_address_real,
     region                => $region,
     glance_user_password  => $glance_user_password,
     nova_user_password    => $nova_user_password,