Skip to content

Commit 5fa1ad5

Browse files
thesurlydevke4qqq
thesurlydev
authored and
ke4qqq
committed
fix for incorrect secondary dns
1 parent 404c7e0 commit 5fa1ad5

8 files changed

Lines changed: 12 additions & 12 deletions

File tree

‎tools/appliance/definitions/systemvmtemplate/postinstall.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ fix_nameserver() {
113113
# Replace /etc/resolv.conf also
114114
cat > /etc/resolv.conf << EOF
115115
nameserver 8.8.8.8
116-
nameserver 4.4.4.4
116+
nameserver 8.8.4.4
117117
EOF
118118
}
119119

‎tools/appliance/definitions/systemvmtemplate64/postinstall.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ fix_nameserver() {
112112
# Replace /etc/resolv.conf also
113113
cat > /etc/resolv.conf << EOF
114114
nameserver 8.8.8.8
115-
nameserver 4.4.4.4
115+
nameserver 8.8.4.4
116116
EOF
117117
}
118118

‎tools/devcloud-kvm/devcloud-kvm.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
]
4747
}
4848
],
49-
"dns2": "4.4.4.4",
49+
"dns2": "8.8.4.4",
5050
"dns1": "8.8.8.8",
5151
"securitygroupenabled": "true",
5252
"localstorageenabled": "true",

‎tools/devcloud/devcloud.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
]
4646
}
4747
],
48-
"dns2": "4.4.4.4",
48+
"dns2": "8.8.4.4",
4949
"dns1": "8.8.8.8",
5050
"securitygroupenabled": "true",
5151
"localstorageenabled": "true",

‎tools/devcloud/devcloud_internal-mgt.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
]
4545
}
4646
],
47-
"dns2": "4.4.4.4",
47+
"dns2": "8.8.4.4",
4848
"dns1": "8.8.8.8",
4949
"securitygroupenabled": "true",
5050
"localstorageenabled": "true",

‎tools/devcloud/quickcloud.cfg‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
]
5050
}
5151
],
52-
"dns2": "4.4.4.4",
52+
"dns2": "8.8.4.4",
5353
"dns1": "8.8.8.8",
5454
"securitygroupenabled": "true",
5555
"localstorageenabled": "true",

‎tools/marvin/marvin/configGenerator.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ def describe_setup_in_basic_mode():
269269
for l in range(1):
270270
z = zone()
271271
z.dns1 = "8.8.8.8"
272-
z.dns2 = "4.4.4.4"
272+
z.dns2 = "8.8.4.4"
273273
z.internaldns1 = "192.168.110.254"
274274
z.internaldns2 = "192.168.110.253"
275275
z.name = "test"+str(l)
@@ -390,7 +390,7 @@ def describe_setup_in_eip_mode():
390390
for l in range(1):
391391
z = zone()
392392
z.dns1 = "8.8.8.8"
393-
z.dns2 = "4.4.4.4"
393+
z.dns2 = "8.8.4.4"
394394
z.internaldns1 = "192.168.110.254"
395395
z.internaldns2 = "192.168.110.253"
396396
z.name = "test"+str(l)
@@ -519,7 +519,7 @@ def describe_setup_in_advanced_mode():
519519
for l in range(1):
520520
z = zone()
521521
z.dns1 = "8.8.8.8"
522-
z.dns2 = "4.4.4.4"
522+
z.dns2 = "8.8.4.4"
523523
z.internaldns1 = "192.168.110.254"
524524
z.internaldns2 = "192.168.110.253"
525525
z.name = "test"+str(l)
@@ -645,7 +645,7 @@ def describe_setup_in_advancedsg_mode():
645645
for l in range(1):
646646
z = zone()
647647
z.dns1 = "8.8.8.8"
648-
z.dns2 = "4.4.4.4"
648+
z.dns2 = "8.8.4.4"
649649
z.internaldns1 = "192.168.110.254"
650650
z.internaldns2 = "192.168.110.253"
651651
z.name = "test"+str(l)

‎tools/marvin/marvin/jsonHelper.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ def getResultObj(returnObj, responsecls=None):
142142
nsp = getResultObj(result)
143143
print nsp[0].id
144144

145-
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"} ] } }'
145+
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"} ] } }'
146146
zones = getResultObj(result)
147147
print zones[0].id
148148
res = authorizeSecurityGroupIngress.authorizeSecurityGroupIngressResponse()
@@ -165,7 +165,7 @@ def getResultObj(returnObj, responsecls=None):
165165
asynJob = getResultObj(result)
166166
print asynJob
167167

168-
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"} } }'
168+
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"} } }'
169169
res = createZone.createZoneResponse()
170170
zone = getResultObj(result, res)
171171
print zone.id

0 commit comments

Comments
 (0)