Merge lp:~alekibango/nova/lp691044 into lp:~hudson-openstack/nova/trunk

[David Pravec]

    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

[Jay Pipes (jaypipes)]

lgtm.

review: Approve

[Jay Pipes (jaypipes)]

Approving to get stuff merged... this is a straightforward and easy fix.

[OpenStack Infra (hudson-openstack)]

Attempt to merge into lp:nova failed due to conflicts:

contents conflict in nova/tests/process_unittest.py

[lp:~alekibango/nova/lp691044]

474. By David Pravec on 2010-12-24

merged trunk, resolved conflict

someone deleted process_unittest.py in trunk, so the problem in that one is gone now.

475. By David Pravec on 2010-12-24

merged trunk, resolved trivial conflict

[Jay Pipes (jaypipes)]

cool, looks good :)

review: Approve

=== modified file 'Authors'
--- Authors	2010-12-23 02:03:39 +0000
+++ Authors	2010-12-24 01:31:50 +0000
@@ -4,6 +4,7 @@
 Armando Migliaccio <[e-mail]>
 Chris Behrens <[e-mail]>
 Chmouel Boudjnah <[e-mail]>
+David Pravec <[e-mail]>
 Dean Troyer <[e-mail]>
 Devin Carlen <[e-mail]>
 Ed Leafe <[e-mail]>

=== modified file 'contrib/nova.sh'
--- contrib/nova.sh	2010-12-15 07:48:51 +0000
+++ contrib/nova.sh	2010-12-24 01:31:50 +0000
@@ -15,7 +15,7 @@
     # 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}

=== modified file 'contrib/puppet/files/production/nova-iptables'
--- contrib/puppet/files/production/nova-iptables	2010-11-12 19:07:46 +0000
+++ contrib/puppet/files/production/nova-iptables	2010-12-24 01:31:50 +0000
@@ -30,6 +30,8 @@
     . /etc/default/nova-iptables
 fi
 
+export LC_ALL=C
+
 API_PORT=${API_PORT:-"8773"}
 
 if [ ! -n "$IP" ]; then

=== modified file 'nova/cloudpipe/bootscript.template'
--- nova/cloudpipe/bootscript.template	2010-11-06 00:02:36 +0000
+++ nova/cloudpipe/bootscript.template	2010-12-24 01:31:50 +0000
@@ -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}'`

=== modified file 'tools/clean-vlans'
--- tools/clean-vlans	2010-07-15 15:52:11 +0000
+++ tools/clean-vlans	2010-12-24 01:31:50 +0000
@@ -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

=== modified file 'tools/setup_iptables.sh'
--- tools/setup_iptables.sh	2010-09-29 00:41:57 +0000
+++ tools/setup_iptables.sh	2010-12-24 01:31:50 +0000
@@ -36,7 +36,7 @@
     # 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