summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Pravec <David.Pravec@danix.org>2010-12-24 01:51:33 +0000
committerTarmac <>2010-12-24 01:51:33 +0000
commit956f842c587bf1610f55ca3893f3b9eef924293c (patch)
tree7d5a89e6e5bb8492dcf6a2b17d20b471a77d0bbe
parent75e2cbec9eb5132a49446f1b6d563d5f43d007de (diff)
parent24eada1bf54f973d5bd423ba51d505352321324c (diff)
downloadnova-956f842c587bf1610f55ca3893f3b9eef924293c.tar.gz
nova-956f842c587bf1610f55ca3893f3b9eef924293c.tar.xz
nova-956f842c587bf1610f55ca3893f3b9eef924293c.zip
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
-rw-r--r--Authors1
-rwxr-xr-xcontrib/nova.sh2
-rwxr-xr-xcontrib/puppet/files/production/nova-iptables2
-rwxr-xr-xnova/cloudpipe/bootscript.template1
-rwxr-xr-xtools/clean-vlans2
-rwxr-xr-xtools/setup_iptables.sh2
6 files changed, 8 insertions, 2 deletions
diff --git a/Authors b/Authors
index 250b3b2ad..851c81e54 100644
--- a/Authors
+++ b/Authors
@@ -4,6 +4,7 @@ Anthony Young <sleepsonthefloor@gmail.com>
Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Chris Behrens <cbehrens@codestud.com>
Chmouel Boudjnah <chmouel@chmouel.com>
+David Pravec <David.Pravec@danix.org>
Dean Troyer <dtroyer@gmail.com>
Devin Carlen <devin.carlen@gmail.com>
Ed Leafe <ed@leafe.com>
diff --git a/contrib/nova.sh b/contrib/nova.sh
index 30df4edb6..da1ba030c 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 b7b52df87..61e2ca2b9 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
diff --git a/nova/cloudpipe/bootscript.template b/nova/cloudpipe/bootscript.template
index 11578c134..94dea3f87 100755
--- a/nova/cloudpipe/bootscript.template
+++ b/nova/cloudpipe/bootscript.template
@@ -19,6 +19,7 @@
# This gets zipped and run on the cloudpipe-managed OpenVPN server
+export LC_ALL=C
export VPN_IP=`ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{print $$1}'`
export BROADCAST=`ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f3 | awk '{print $$1}'`
export DHCP_MASK=`ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f4 | awk '{print $$1}'`
diff --git a/tools/clean-vlans b/tools/clean-vlans
index f5b0295ad..820a9dbe5 100755
--- a/tools/clean-vlans
+++ b/tools/clean-vlans
@@ -17,6 +17,8 @@
# License for the specific language governing permissions and limitations
# under the License.
+export LC_ALL=C
+
sudo ifconfig -a | grep br | grep -v bridge | cut -f1 -d" " | xargs -n1 -ifoo ifconfig foo down
sudo ifconfig -a | grep br | grep -v bridge | cut -f1 -d" " | xargs -n1 -ifoo brctl delbr foo
sudo ifconfig -a | grep vlan | grep -v vlan124 | grep -v vlan5 | cut -f1 -d" " | xargs -n1 -ifoo ifconfig foo down
diff --git a/tools/setup_iptables.sh b/tools/setup_iptables.sh
index 673353eb4..8be8cd812 100755
--- a/tools/setup_iptables.sh
+++ b/tools/setup_iptables.sh
@@ -36,7 +36,7 @@ else
# 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 pass in the ip of the instance
- IP=`ifconfig | grep -m 1 'inet addr:'| cut -d: -f2 | awk '{print $1}'`
+ IP=`LC_ALL=C ifconfig | grep -m 1 'inet addr:'| cut -d: -f2 | awk '{print $1}'`
fi
if [ -n "$3" ]; then