From cef3e552e6451feae4f740e4f887f851ba507c6a Mon Sep 17 00:00:00 2001
From: Ghe Rivero <ghe.rivero@gmail.com>
Date: Mon, 12 Nov 2012 13:09:54 +0000
Subject: [PATCH] Fix mysql passwords

---
 flavours/nova-vm/first-boot.d/defaults | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/flavours/nova-vm/first-boot.d/defaults b/flavours/nova-vm/first-boot.d/defaults
index 6ce09d56..9c71666a 100644
--- a/flavours/nova-vm/first-boot.d/defaults
+++ b/flavours/nova-vm/first-boot.d/defaults
@@ -9,11 +9,11 @@ HOST_IP_IFACE=${HOST_IP_IFACE:-$(ip route | sed -n '/^default/{ s/.*dev \(\w\+\)
 HOST_IP=`LC_ALL=C ip -f inet addr show ${HOST_IP_IFACE} | awk '/inet/ {split($2,parts,"/");  print parts[1]}'`
 
 # Mysql Passwords
-MYSQL_ADMPASS=${MYSQL_ADMPASS:-$ {DEFAULT_PASSWORD}}
-MYSQL_NOVAPASS=${MYSQL_NOVAPASS:-$MYSQL_ADMPASS}
-MYSQL_GLANCEPASS=${MYSQL_GLANCEPASS:-$MYSQL_ADMPASS}
-MYSQL_KEYSTONEPASS=${MYSQL_KEYSTONEPASS:-$MYSQL_ADMPASS}
-MYSQL_CINDERPASS=${MYSQL_CINDERPASS:-$MYSQL_ADMPASS}
+MYSQL_ADMPASS=${MYSQL_ADMPASS:-${DEFAULT_PASSWORD}}
+MYSQL_NOVAPASS=${MYSQL_NOVAPASS:-${MYSQL_ADMPASS}}
+MYSQL_GLANCEPASS=${MYSQL_GLANCEPASS:-${MYSQL_ADMPASS}}
+MYSQL_KEYSTONEPASS=${MYSQL_KEYSTONEPASS:-${MYSQL_ADMPASS}}
+MYSQL_CINDERPASS=${MYSQL_CINDERPASS:-${MYSQL_ADMPASS}}
 
 #Rabbitmq Passwords
 RABBIT_PASS=${RABBIT_PASS:-${DEFAULT_PASSWORD}}