summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorDavid Pravec <David.Pravec@danix.org>2010-12-16 12:35:46 +0100
committerDavid Pravec <David.Pravec@danix.org>2010-12-16 12:35:46 +0100
commit8060b526e1fecc66a6766de3f9e4b008e69af1e3 (patch)
treea0c5e35fc2b920ba2c9247637135141063241d2e /contrib
parentedff8090714f11305d6dbc091a96eece20f0d1a1 (diff)
downloadnova-8060b526e1fecc66a6766de3f9e4b008e69af1e3.tar.gz
Make nova work even when user has LANG or LC_ALL configured
Some commands are having different results when used in another language environment. For example ifconfig output parsing fails in my language. Also unittest using cat failed, as it didnt expect czech language in the error message. This small patch makes it work. Also adding myself to 'Authors' file.
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/nova.sh2
-rwxr-xr-xcontrib/puppet/files/production/nova-iptables2
2 files changed, 3 insertions, 1 deletions
diff --git a/contrib/nova.sh b/contrib/nova.sh
index 30df4edb65..da1ba030c3 100755
--- a/contrib/nova.sh
+++ b/contrib/nova.sh
@@ -15,7 +15,7 @@ if [ ! -n "$HOST_IP" ]; then
# NOTE(vish): This will just get the first ip in the list, so if you
# have more than one eth device set up, this will fail, and
# you should explicitly set HOST_IP in your environment
- HOST_IP=`ifconfig | grep -m 1 'inet addr:'| cut -d: -f2 | awk '{print $1}'`
+ HOST_IP=`LC_ALL=C ifconfig | grep -m 1 'inet addr:'| cut -d: -f2 | awk '{print $1}'`
fi
USE_MYSQL=${USE_MYSQL:-0}
diff --git a/contrib/puppet/files/production/nova-iptables b/contrib/puppet/files/production/nova-iptables
index b7b52df877..61e2ca2b92 100755
--- a/contrib/puppet/files/production/nova-iptables
+++ b/contrib/puppet/files/production/nova-iptables
@@ -30,6 +30,8 @@ if [ -f /etc/default/nova-iptables ] ; then
. /etc/default/nova-iptables
fi
+export LC_ALL=C
+
API_PORT=${API_PORT:-"8773"}
if [ ! -n "$IP" ]; then