You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ke...@apache.org on 2013/06/05 23:21:45 UTC
git commit: updated refs/heads/master to 5fa1ad5
Updated Branches:
refs/heads/master 404c7e0df -> 5fa1ad518
fix for incorrect secondary dns
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5fa1ad51
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5fa1ad51
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5fa1ad51
Branch: refs/heads/master
Commit: 5fa1ad518f374bd736c121937f08ac699354a1dd
Parents: 404c7e0
Author: Shane Witbeck <sh...@digitalsanctum.com>
Authored: Wed Jun 5 12:36:16 2013 -0400
Committer: David Nalley <da...@gnsa.us>
Committed: Wed Jun 5 17:21:44 2013 -0400
----------------------------------------------------------------------
.../definitions/systemvmtemplate/postinstall.sh | 2 +-
.../definitions/systemvmtemplate64/postinstall.sh | 2 +-
tools/devcloud-kvm/devcloud-kvm.cfg | 2 +-
tools/devcloud/devcloud.cfg | 2 +-
tools/devcloud/devcloud_internal-mgt.cfg | 2 +-
tools/devcloud/quickcloud.cfg | 2 +-
tools/marvin/marvin/configGenerator.py | 8 ++++----
tools/marvin/marvin/jsonHelper.py | 4 ++--
8 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5fa1ad51/tools/appliance/definitions/systemvmtemplate/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index 7c06796..e052cf9 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -113,7 +113,7 @@ fix_nameserver() {
# Replace /etc/resolv.conf also
cat > /etc/resolv.conf << EOF
nameserver 8.8.8.8
-nameserver 4.4.4.4
+nameserver 8.8.4.4
EOF
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5fa1ad51/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
----------------------------------------------------------------------
diff --git a/tools/appliance/definitions/systemvmtemplate64/postinstall.sh b/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
index 35a4e4a..786d38d 100644
--- a/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate64/postinstall.sh
@@ -112,7 +112,7 @@ fix_nameserver() {
# Replace /etc/resolv.conf also
cat > /etc/resolv.conf << EOF
nameserver 8.8.8.8
-nameserver 4.4.4.4
+nameserver 8.8.4.4
EOF
}
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5fa1ad51/tools/devcloud-kvm/devcloud-kvm.cfg
----------------------------------------------------------------------
diff --git a/tools/devcloud-kvm/devcloud-kvm.cfg b/tools/devcloud-kvm/devcloud-kvm.cfg
index b3f048a..9f310e3 100644
--- a/tools/devcloud-kvm/devcloud-kvm.cfg
+++ b/tools/devcloud-kvm/devcloud-kvm.cfg
@@ -46,7 +46,7 @@
]
}
],
- "dns2": "4.4.4.4",
+ "dns2": "8.8.4.4",
"dns1": "8.8.8.8",
"securitygroupenabled": "true",
"localstorageenabled": "true",
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5fa1ad51/tools/devcloud/devcloud.cfg
----------------------------------------------------------------------
diff --git a/tools/devcloud/devcloud.cfg b/tools/devcloud/devcloud.cfg
index e6ab71b..f665e82 100644
--- a/tools/devcloud/devcloud.cfg
+++ b/tools/devcloud/devcloud.cfg
@@ -45,7 +45,7 @@
]
}
],
- "dns2": "4.4.4.4",
+ "dns2": "8.8.4.4",
"dns1": "8.8.8.8",
"securitygroupenabled": "true",
"localstorageenabled": "true",
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5fa1ad51/tools/devcloud/devcloud_internal-mgt.cfg
----------------------------------------------------------------------
diff --git a/tools/devcloud/devcloud_internal-mgt.cfg b/tools/devcloud/devcloud_internal-mgt.cfg
index fe3dd1b..beae345 100644
--- a/tools/devcloud/devcloud_internal-mgt.cfg
+++ b/tools/devcloud/devcloud_internal-mgt.cfg
@@ -44,7 +44,7 @@
]
}
],
- "dns2": "4.4.4.4",
+ "dns2": "8.8.4.4",
"dns1": "8.8.8.8",
"securitygroupenabled": "true",
"localstorageenabled": "true",
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5fa1ad51/tools/devcloud/quickcloud.cfg
----------------------------------------------------------------------
diff --git a/tools/devcloud/quickcloud.cfg b/tools/devcloud/quickcloud.cfg
index a2613d2..77bc114 100644
--- a/tools/devcloud/quickcloud.cfg
+++ b/tools/devcloud/quickcloud.cfg
@@ -49,7 +49,7 @@
]
}
],
- "dns2": "4.4.4.4",
+ "dns2": "8.8.4.4",
"dns1": "8.8.8.8",
"securitygroupenabled": "true",
"localstorageenabled": "true",
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5fa1ad51/tools/marvin/marvin/configGenerator.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/configGenerator.py b/tools/marvin/marvin/configGenerator.py
index c970ada..bd83efb 100644
--- a/tools/marvin/marvin/configGenerator.py
+++ b/tools/marvin/marvin/configGenerator.py
@@ -269,7 +269,7 @@ def describe_setup_in_basic_mode():
for l in range(1):
z = zone()
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.internaldns2 = "192.168.110.253"
z.name = "test"+str(l)
@@ -390,7 +390,7 @@ def describe_setup_in_eip_mode():
for l in range(1):
z = zone()
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.internaldns2 = "192.168.110.253"
z.name = "test"+str(l)
@@ -519,7 +519,7 @@ def describe_setup_in_advanced_mode():
for l in range(1):
z = zone()
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.internaldns2 = "192.168.110.253"
z.name = "test"+str(l)
@@ -645,7 +645,7 @@ def describe_setup_in_advancedsg_mode():
for l in range(1):
z = zone()
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.internaldns2 = "192.168.110.253"
z.name = "test"+str(l)
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5fa1ad51/tools/marvin/marvin/jsonHelper.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/jsonHelper.py b/tools/marvin/marvin/jsonHelper.py
index 37363bc..79a6369 100644
--- a/tools/marvin/marvin/jsonHelper.py
+++ b/tools/marvin/marvin/jsonHelper.py
@@ -142,7 +142,7 @@ if __name__ == "__main__":
nsp = getResultObj(result)
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)
print zones[0].id
res = authorizeSecurityGroupIngress.authorizeSecurityGroupIngressResponse()
@@ -165,7 +165,7 @@ if __name__ == "__main__":
asynJob = getResultObj(result)
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()
zone = getResultObj(result, res)
print zone.id