diff options
| author | David Pravec <David.Pravec@danix.org> | 2010-12-24 02:10:40 +0100 |
|---|---|---|
| committer | David Pravec <David.Pravec@danix.org> | 2010-12-24 02:10:40 +0100 |
| commit | 6035549fb7a930a0f0995da7ae696a4dc1ebc548 (patch) | |
| tree | 6c85fed91e324f402c2b1fd4c2c86b4360e9be3d /nova | |
| parent | 41b5e4a12d23308f2143dfb5a059c43a931370e2 (diff) | |
| parent | 8060b526e1fecc66a6766de3f9e4b008e69af1e3 (diff) | |
merged trunk, resolved conflict
someone deleted process_unittest.py in trunk, so the problem in that one is gone now.
Diffstat (limited to 'nova')
| -rwxr-xr-x | nova/cloudpipe/bootscript.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nova/cloudpipe/bootscript.sh b/nova/cloudpipe/bootscript.sh index 30d9ad102..551b40f2f 100755 --- a/nova/cloudpipe/bootscript.sh +++ b/nova/cloudpipe/bootscript.sh @@ -19,6 +19,7 @@ # 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 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}'` |