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.
This commit is contained in:
David Pravec 2010-12-16 12:35:46 +01:00
parent edff809071
commit 8060b526e1
7 changed files with 9 additions and 3 deletions

View File

@ -4,6 +4,7 @@ Anthony Young <sleepsonthefloor@gmail.com>
Armando Migliaccio <Armando.Migliaccio@eu.citrix.com> Armando Migliaccio <Armando.Migliaccio@eu.citrix.com>
Chris Behrens <cbehrens@codestud.com> Chris Behrens <cbehrens@codestud.com>
Chmouel Boudjnah <chmouel@chmouel.com> Chmouel Boudjnah <chmouel@chmouel.com>
David Pravec <David.Pravec@danix.org>
Dean Troyer <dtroyer@gmail.com> Dean Troyer <dtroyer@gmail.com>
Devin Carlen <devin.carlen@gmail.com> Devin Carlen <devin.carlen@gmail.com>
Eldar Nugaev <enugaev@griddynamics.com> Eldar Nugaev <enugaev@griddynamics.com>

View File

@ -15,7 +15,7 @@ if [ ! -n "$HOST_IP" ]; then
# NOTE(vish): This will just get the first ip in the list, so if you # 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 # have more than one eth device set up, this will fail, and
# you should explicitly set HOST_IP in your environment # 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 fi
USE_MYSQL=${USE_MYSQL:-0} USE_MYSQL=${USE_MYSQL:-0}

View File

@ -30,6 +30,8 @@ if [ -f /etc/default/nova-iptables ] ; then
. /etc/default/nova-iptables . /etc/default/nova-iptables
fi fi
export LC_ALL=C
API_PORT=${API_PORT:-"8773"} API_PORT=${API_PORT:-"8773"}
if [ ! -n "$IP" ]; then if [ ! -n "$IP" ]; then

View File

@ -19,6 +19,7 @@
# This gets zipped and run on the cloudpipe-managed OpenVPN server # This gets zipped and run on the cloudpipe-managed OpenVPN server
export LC_ALL=C
export SUPERVISOR="http://10.255.255.1:8773/cloudpipe" export SUPERVISOR="http://10.255.255.1:8773/cloudpipe"
export VPN_IP=`ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{print $1}'` 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 BROADCAST=`ifconfig | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f3 | awk '{print $1}'`

View File

@ -49,7 +49,7 @@ class ProcessTestCase(test.TrialTestCase):
def test_execute_stderr(self): def test_execute_stderr(self):
pool = process.ProcessPool(2) pool = process.ProcessPool(2)
d = pool.simple_execute('cat BAD_FILE', check_exit_code=False) d = pool.simple_execute('LC_ALL=C cat BAD_FILE', check_exit_code=False)
def _check(rv): def _check(rv):
self.assertEqual(rv[0], '') self.assertEqual(rv[0], '')

View File

@ -17,6 +17,8 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # 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 ifconfig foo down
sudo ifconfig -a | grep br | grep -v bridge | cut -f1 -d" " | xargs -n1 -ifoo brctl delbr foo 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 sudo ifconfig -a | grep vlan | grep -v vlan124 | grep -v vlan5 | cut -f1 -d" " | xargs -n1 -ifoo ifconfig foo down

View File

@ -36,7 +36,7 @@ else
# NOTE(vish): This will just get the first ip in the list, so if you # 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 # have more than one eth device set up, this will fail, and
# you should explicitly pass in the ip of the instance # 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 fi
if [ -n "$3" ]; then if [ -n "$3" ]; then