Merge pull request #340 from tbeckham/4.2-dns

Fix DNS service detection and get hostname for DNS service issue
eucalyptus · May 16, 2015 · df14774 · df14774
2 parents 91ecca9 + 25e87df
commit df14774
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/testcases/cloud_admin/install_euca.py b/testcases/cloud_admin/install_euca.py
@@ -340,14 +340,14 @@ def setup_dns(self):
             self.tester = Eucaops(config_file=self.args.config_file, password=self.args.password)
         self.tester.modify_property("bootstrap.webservices.use_dns_delegation", "true")
         self.tester.modify_property("bootstrap.webservices.use_instance_dns", "true")
-        enabled_ufs = self.tester.service_manager.get_enabled_osg()
+        enabled_dns = self.tester.service_manager.get_enabled_dns()
         if self.args.dnsdomain:
             self.tester.modify_property("system.dns.dnsdomain", self.args.dnsdomain)
         else:
-            hostname = enabled_ufs.machine.sys('hostname')[0].split(".")[0]
+            hostname = self.tester.get_machine_by_ip(enabled_dns.hostname).sys('hostname')[0].split(".")[0]
             domain = hostname + ".autoqa.qa1.eucalyptus-systems.com"
             self.tester.modify_property("system.dns.dnsdomain", domain)
-        self.tester.modify_property("system.dns.nameserveraddress", enabled_ufs.hostname)
+        self.tester.modify_property("system.dns.nameserveraddress", enabled_dns.hostname)
 
     def clean_method(self):
         pass