apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix for incorrect secondary dns

Browse Source
This commit is contained in:
Shane Witbeck 2013-06-05 12:36:16 -04:00 committed by David Nalley
parent 404c7e0dfd
commit 5fa1ad518f
8 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/appliance/definitions/systemvmtemplate/postinstall.sh
View File

@ -113,7 +113,7 @@ fix_nameserver() {
# Replace /etc/resolv.conf also # Replace /etc/resolv.conf also
cat > /etc/resolv.conf << EOF cat > /etc/resolv.conf << EOF
nameserver 8.8.8.8 nameserver 8.8.8.8
nameserver 4.4.4.4 nameserver 8.8.4.4
EOF EOF
} }

2
tools/appliance/definitions/systemvmtemplate64/postinstall.sh
View File

@ -112,7 +112,7 @@ fix_nameserver() {
# Replace /etc/resolv.conf also # Replace /etc/resolv.conf also
cat > /etc/resolv.conf << EOF cat > /etc/resolv.conf << EOF
nameserver 8.8.8.8 nameserver 8.8.8.8
nameserver 4.4.4.4 nameserver 8.8.4.4
EOF EOF
} }

2
tools/devcloud-kvm/devcloud-kvm.cfg
View File

@ -46,7 +46,7 @@
] ]
} }
], ],
"dns2": "4.4.4.4", "dns2": "8.8.4.4",
"dns1": "8.8.8.8", "dns1": "8.8.8.8",
"securitygroupenabled": "true", "securitygroupenabled": "true",
"localstorageenabled": "true", "localstorageenabled": "true",

2
tools/devcloud/devcloud.cfg
View File

@ -45,7 +45,7 @@
] ]
} }
], ],
"dns2": "4.4.4.4", "dns2": "8.8.4.4",
"dns1": "8.8.8.8", "dns1": "8.8.8.8",
"securitygroupenabled": "true", "securitygroupenabled": "true",
"localstorageenabled": "true", "localstorageenabled": "true",

2
tools/devcloud/devcloud_internal-mgt.cfg
View File

@ -44,7 +44,7 @@
] ]
} }
], ],
"dns2": "4.4.4.4", "dns2": "8.8.4.4",
"dns1": "8.8.8.8", "dns1": "8.8.8.8",
"securitygroupenabled": "true", "securitygroupenabled": "true",
"localstorageenabled": "true", "localstorageenabled": "true",

2
tools/devcloud/quickcloud.cfg
View File

@ -49,7 +49,7 @@
] ]
} }
], ],
"dns2": "4.4.4.4", "dns2": "8.8.4.4",
"dns1": "8.8.8.8", "dns1": "8.8.8.8",
"securitygroupenabled": "true", "securitygroupenabled": "true",
"localstorageenabled": "true", "localstorageenabled": "true",

8
tools/marvin/marvin/configGenerator.py
View File

@ -269,7 +269,7 @@ def describe_setup_in_basic_mode():
for l in range(1): for l in range(1):
z = zone() z = zone()
z.dns1 = "8.8.8.8" z.dns1 = "8.8.8.8"
z.dns2 = "4.4.4.4" z.dns2 = "8.8.4.4"
z.internaldns1 = "192.168.110.254" z.internaldns1 = "192.168.110.254"
z.internaldns2 = "192.168.110.253" z.internaldns2 = "192.168.110.253"
z.name = "test"+str(l) z.name = "test"+str(l)
@ -390,7 +390,7 @@ def describe_setup_in_eip_mode():
for l in range(1): for l in range(1):
z = zone() z = zone()
z.dns1 = "8.8.8.8" z.dns1 = "8.8.8.8"
z.dns2 = "4.4.4.4" z.dns2 = "8.8.4.4"
z.internaldns1 = "192.168.110.254" z.internaldns1 = "192.168.110.254"
z.internaldns2 = "192.168.110.253" z.internaldns2 = "192.168.110.253"
z.name = "test"+str(l) z.name = "test"+str(l)
@ -519,7 +519,7 @@ def describe_setup_in_advanced_mode():
for l in range(1): for l in range(1):
z = zone() z = zone()
z.dns1 = "8.8.8.8" z.dns1 = "8.8.8.8"
z.dns2 = "4.4.4.4" z.dns2 = "8.8.4.4"
z.internaldns1 = "192.168.110.254" z.internaldns1 = "192.168.110.254"
z.internaldns2 = "192.168.110.253" z.internaldns2 = "192.168.110.253"
z.name = "test"+str(l) z.name = "test"+str(l)
@ -645,7 +645,7 @@ def describe_setup_in_advancedsg_mode():
for l in range(1): for l in range(1):
z = zone() z = zone()
z.dns1 = "8.8.8.8" z.dns1 = "8.8.8.8"
z.dns2 = "4.4.4.4" z.dns2 = "8.8.4.4"
z.internaldns1 = "192.168.110.254" z.internaldns1 = "192.168.110.254"
z.internaldns2 = "192.168.110.253" z.internaldns2 = "192.168.110.253"
z.name = "test"+str(l) z.name = "test"+str(l)

4
tools/marvin/marvin/jsonHelper.py
View File

@ -142,7 +142,7 @@ if __name__ == "__main__":
nsp = getResultObj(result) nsp = getResultObj(result)
print nsp[0].id print nsp[0].id
result = '{ "listzonesresponse" : { "count":1 ,"zone" : [ {"id":1,"name":"test0","dns1":"8.8.8.8","dns2":"4.4.4.4","internaldns1":"192.168.110.254","internaldns2":"192.168.110.253","networktype":"Basic","securitygroupsenabled":true,"allocationstate":"Enabled","zonetoken":"5e818a11-6b00-3429-9a07-e27511d3169a","dhcpprovider":"DhcpServer"} ] } }' result = '{ "listzonesresponse" : { "count":1 ,"zone" : [ {"id":1,"name":"test0","dns1":"8.8.8.8","dns2":"8.8.4.4","internaldns1":"192.168.110.254","internaldns2":"192.168.110.253","networktype":"Basic","securitygroupsenabled":true,"allocationstate":"Enabled","zonetoken":"5e818a11-6b00-3429-9a07-e27511d3169a","dhcpprovider":"DhcpServer"} ] } }'
zones = getResultObj(result) zones = getResultObj(result)
print zones[0].id print zones[0].id
res = authorizeSecurityGroupIngress.authorizeSecurityGroupIngressResponse() res = authorizeSecurityGroupIngress.authorizeSecurityGroupIngressResponse()
@ -165,7 +165,7 @@ if __name__ == "__main__":
asynJob = getResultObj(result) asynJob = getResultObj(result)
print asynJob print asynJob
result = '{ "createzoneresponse" : { "zone" : {"id":1,"name":"test0","dns1":"8.8.8.8","dns2":"4.4.4.4","internaldns1":"192.168.110.254","internaldns2":"192.168.110.253","networktype":"Basic","securitygroupsenabled":true,"allocationstate":"Enabled","zonetoken":"3442f287-e932-3111-960b-514d1f9c4610","dhcpprovider":"DhcpServer"} } }' result = '{ "createzoneresponse" : { "zone" : {"id":1,"name":"test0","dns1":"8.8.8.8","dns2":"8.8.4.4","internaldns1":"192.168.110.254","internaldns2":"192.168.110.253","networktype":"Basic","securitygroupsenabled":true,"allocationstate":"Enabled","zonetoken":"3442f287-e932-3111-960b-514d1f9c4610","dhcpprovider":"DhcpServer"} } }'
res = createZone.createZoneResponse() res = createZone.createZoneResponse()
zone = getResultObj(result, res) zone = getResultObj(result, res)
print zone.id print zone.id