merged trunk, resolved conflict
someone deleted process_unittest.py in trunk, so the problem in that one is gone now.
This commit is contained in:
commit
6035549fb7
1
Authors
1
Authors
@ -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>
|
||||||
Ed Leafe <ed@leafe.com>
|
Ed Leafe <ed@leafe.com>
|
||||||
|
@ -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}
|
||||||
|
@ -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
|
||||||
|
@ -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}'`
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user