Merge lp:~allenap/maas/remove-makeSiteService into lp:~maas-committers/maas/trunk

Proposed by Gavin Panella
Status: Merged
Approved by: Gavin Panella
Approved revision: no longer in the source branch.
Merged at revision: 5899
Proposed branch: lp:~allenap/maas/remove-makeSiteService
Merge into: lp:~maas-committers/maas/trunk
Diff against target: 34 lines (+0/-14)
1 file modified
src/provisioningserver/plugin.py (+0/-14)
To merge this branch: bzr merge lp:~allenap/maas/remove-makeSiteService
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+321530@code.launchpad.net

Commit message

Remove ProvisioningServiceMaker._makeSiteService.

It has not been used for years.

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/provisioningserver/plugin.py'
2--- src/provisioningserver/plugin.py 2016-12-08 22:00:14 +0000
3+++ src/provisioningserver/plugin.py 2017-03-31 09:46:27 +0000
4@@ -21,12 +21,9 @@
5 from provisioningserver.utils.debug import (
6 register_sigusr2_thread_dump_handler,
7 )
8-from twisted.application.internet import TCPServer
9 from twisted.application.service import IServiceMaker
10 from twisted.internet import reactor
11 from twisted.plugin import IPlugin
12-from twisted.web.resource import Resource
13-from twisted.web.server import Site
14 from zope.interface import implementer
15
16
17@@ -44,17 +41,6 @@
18 self.tapname = name
19 self.description = description
20
21- def _makeSiteService(self, papi_xmlrpc, config):
22- """Create the site service."""
23- site_root = Resource()
24- site_root.putChild("api", papi_xmlrpc)
25- site = Site(site_root)
26- site_port = config["port"]
27- site_interface = config["interface"]
28- site_service = TCPServer(site_port, site, interface=site_interface)
29- site_service.setName("site")
30- return site_service
31-
32 def _makeImageService(self, resource_root):
33 from provisioningserver.rackdservices.image import (
34 BootImageEndpointService)