← Back to branch summary

~allenap/maas/async-use-fixture

« back to all changes in this revision

Viewing changes to src/provisioningserver/plugin.py

  • Committer: MaaS Lander
  • Author(s): Graham Binns
  • Date: 2014-08-19 08:34:03 UTC
  • mfrom: (2756.1.1 revert-r2750)
  • Revision ID: maas_lander-20140819083403-b800oag7c99ect0w
[r=gmb][bug=][author=gmb] Revert r2750, which has several large problems that need fixing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/provisioningserver/plugin.py
31
31
import provisioningserver
32
32
from provisioningserver.cluster_config import get_cluster_uuid
33
33
from provisioningserver.config import Config
34
 
from provisioningserver.dhcp.dhcp_probe_service import (
35
 
    PeriodicDHCPProbeService,
36
 
    )
37
34
from provisioningserver.image_download_service import (
38
35
    PeriodicImageDownloadService,
39
36
    )
244
241
        rpc_service.setName("rpc")
245
242
        return rpc_service
246
243
 
247
 
    def _makePeriodicDHCPProbeService(self, rpc_service):
248
 
        dhcp_probe_service = PeriodicDHCPProbeService(reactor)
249
 
        dhcp_probe_service.setName("dhcp_probe")
250
 
        return dhcp_probe_service
251
 
 
252
244
    def makeService(self, options):
253
245
        """Construct a service."""
254
246
        services = provisioningserver.services
273
265
            rpc_service)
274
266
        image_download_service.setServiceParent(services)
275
267
 
276
 
        dhcp_probe_service = self._makePeriodicDHCPProbeService(rpc_service)
277
 
        dhcp_probe_service.setServiceParent(services)
278
 
 
279
268
        return services