← Back to branch summary

~maas-maintainers/maas/qa-lab-tests-1.8

« back to all changes in this revision

Viewing changes to maas-integration.py

  • Committer: Blake Rouse
  • Date: 2015-08-18 13:33:21 UTC
  • Revision ID: blake.rouse@canonical.com-20150818133321-1qtqbehruq00qyah
Change dhcpd.conf path back to /etc/maas/dhcpd.conf.

Show diffs side-by-side

added added

removed removed

Lines of Context:
maas-integration.py
515
515
        self._set_up_dhcp(region_uuid, REGION_DHCP_CONFIG)
516
516
 
517
517
        # Wait for the task to complete and create the dhcpd.conf file.
518
 
        while os.path.exists("/var/lib/maas/dhcpd.conf") is False:
 
518
        while os.path.exists("/etc/maas/dhcpd.conf") is False:
519
519
            self.addDetail(
520
520
                "Waiting task create dhcpd.conf file.",
521
521
                content_from_file("/var/log/maas/maas.log"))