From 69e46afb418dafe39930c93608d5d1936592b671 Mon Sep 17 00:00:00 2001
From: Wong Hoi Sing Edison <hswong3i@pantarei-design.com>
Date: Tue, 19 Jun 2012 21:43:54 +0800
Subject: [PATCH] compute.pp's admin_password should sync with
 $nova_user_password of controller.pp.

---
 examples/site.pp     | 1 +
 manifests/compute.pp | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/examples/site.pp b/examples/site.pp
index ab12024..96ca82a 100644
--- a/examples/site.pp
+++ b/examples/site.pp
@@ -129,6 +129,7 @@ node /openstack_compute/ {
     network_manager    => 'nova.network.manager.FlatDHCPManager',
     multi_host         => false,
     sql_connection     => $sql_connection,
+    nova_user_password => $nova_user_password,
     rabbit_host        => $controller_node_internal,
     rabbit_password    => $rabbit_password,
     rabbit_user        => $rabbit_user,
diff --git a/manifests/compute.pp b/manifests/compute.pp
index 3bb9843..bc8f333 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -23,6 +23,7 @@
 # [sql_connection] SQL connection information. Optional. Defaults to false
 #   which indicates that exported resources will be used to determine connection
 #   information.
+# [nova_user_password] Nova service password.
 #  [rabbit_host] RabbitMQ host. False indicates it should be collected.
 #    Optional. Defaults to false,
 #  [rabbit_password] RabbitMQ password. Optional. Defaults to  'rabbit_pw',
@@ -55,6 +56,7 @@ class openstack::compute(
   # my address
   # conection information
   $sql_connection      = false,
+  $nova_user_password  = 'nova_pass',
   $rabbit_host         = false,
   $rabbit_password     = 'rabbit_pw',
   $rabbit_user         = 'nova',
@@ -105,7 +107,7 @@ class openstack::compute(
       enabled           => true,
       admin_tenant_name => 'services',
       admin_user        => 'nova',
-      admin_password    => $nova_service_password,
+      admin_password    => $nova_user_password,
     }
   } else {
     $enable_network_service = false