diff options
| author | Anne Gentle <anne@openstack.org> | 2011-01-03 16:58:45 -0600 |
|---|---|---|
| committer | Anne Gentle <anne@openstack.org> | 2011-01-03 16:58:45 -0600 |
| commit | 4ced09acb75ec0ebc431b98a84763f5f6530ba66 (patch) | |
| tree | 322a50150dab9d17c087d0f2ed2d34cc47c85e11 /nova/cloudpipe | |
| parent | dc2c64b7d7a8ebab8a8ddb69474fdce0086a7ec8 (diff) | |
| parent | bed422cb2677f9e7505b5e7dc9ac46edb9a90dea (diff) | |
Fixing merge conflicts with new branch
Diffstat (limited to 'nova/cloudpipe')
| -rwxr-xr-x | nova/cloudpipe/bootscript.template | 1 |
1 files changed, 1 insertions, 0 deletions
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}'` |