mirror of https://github.com/apache/cloudstack.git
VPC : bug fix
This commit is contained in:
parent
a159255e36
commit
52d93071c8
|
|
@ -31,7 +31,7 @@ usage() {
|
||||||
|
|
||||||
|
|
||||||
setup_dnsmasq() {
|
setup_dnsmasq() {
|
||||||
loger -t cloud "Setting up dnsmasq for network $ip/$mask "
|
logger -t cloud "Setting up dnsmasq for network $ip/$mask "
|
||||||
# setup static
|
# setup static
|
||||||
sed -i -e "/^[#]*dhcp-range=interface:$dev/d" /etc/dnsmasq.d/cloud.conf
|
sed -i -e "/^[#]*dhcp-range=interface:$dev/d" /etc/dnsmasq.d/cloud.conf
|
||||||
echo "dhcp-range=interface:$dev,set:interface-$dev,$ip,static" >> /etc/dnsmasq.d/cloud.conf
|
echo "dhcp-range=interface:$dev,set:interface-$dev,$ip,static" >> /etc/dnsmasq.d/cloud.conf
|
||||||
|
|
@ -58,7 +58,7 @@ setup_dnsmasq() {
|
||||||
}
|
}
|
||||||
|
|
||||||
desetup_dnsmasq() {
|
desetup_dnsmasq() {
|
||||||
loger -t cloud "Setting up dnsmasq for network $ip/$mask "
|
logger -t cloud "Setting up dnsmasq for network $ip/$mask "
|
||||||
|
|
||||||
sed -i -e "/^[#]*dhcp-option=tag:interface-$dev,option:router.*$/d" /etc/dnsmasq.d/cloud.conf
|
sed -i -e "/^[#]*dhcp-option=tag:interface-$dev,option:router.*$/d" /etc/dnsmasq.d/cloud.conf
|
||||||
sed -i -e "/^[#]*dhcp-option=tag:interface-$dev,6.*$/d" /etc/dnsmasq.d/cloud.conf
|
sed -i -e "/^[#]*dhcp-option=tag:interface-$dev,6.*$/d" /etc/dnsmasq.d/cloud.conf
|
||||||
|
|
@ -71,7 +71,9 @@ desetup_dnsmasq() {
|
||||||
create_guest_network() {
|
create_guest_network() {
|
||||||
logger -t cloud " $(basename $0): Create network on interface $dev, gateway $gw, network $ip/$mask "
|
logger -t cloud " $(basename $0): Create network on interface $dev, gateway $gw, network $ip/$mask "
|
||||||
|
|
||||||
sudo ip addr add $dev $ip/$mask
|
sudo ip addr add dev $dev $ip/$mask
|
||||||
|
sudo ip link set $dev up
|
||||||
|
sudo arping -c 3 -I $dev -A -U -s $ip $ip;
|
||||||
|
|
||||||
# create inbound acl chain
|
# create inbound acl chain
|
||||||
if sudo iptables -N ACL_INBOUND_$ip 2>/dev/null
|
if sudo iptables -N ACL_INBOUND_$ip 2>/dev/null
|
||||||
|
|
|
||||||
2
wscript
2
wscript
|
|
@ -4,7 +4,7 @@
|
||||||
# the following two variables are used by the target "waf dist"
|
# the following two variables are used by the target "waf dist"
|
||||||
# if you change 'em here, you need to change it also in cloud.spec, add a %changelog entry there, and add an entry in debian/changelog
|
# if you change 'em here, you need to change it also in cloud.spec, add a %changelog entry there, and add an entry in debian/changelog
|
||||||
|
|
||||||
VERSION = '3.0.3.2012-06-08T00:42:03Z'
|
VERSION = '3.0.3.2012-06-08T01:50:26Z'
|
||||||
APPNAME = 'cloud'
|
APPNAME = 'cloud'
|
||||||
|
|
||||||
import shutil,os
|
import shutil,os
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue