Merge lp:~jtv/maas/hardcode-dhcpv6-path into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Hard-code paths to DHCPv6 files, instead of taking them from Celery config.

At the point where these paths are needed, the celery config does not seem to contain them! I only see a very minimal celery config, not all the settings we define in celeryconfig_common.py. It's not quite worth digging up, because we're in the process of removing this configuration anyway.

It's hard to keep track of changes in execution environment with everybody working on different things. Julian used a similar approach for a similar problem the other day.

The one advantage of the configuring this in the Celery file is that we can have a different setting for development branches, but it does not make much sense to serve DHCP from a branch.

Jeroen

[Gavin Panella (allenap)]

review: Approve

=== modified file 'etc/celeryconfig_common.py'
--- etc/celeryconfig_common.py	2014-08-22 11:23:35 +0000
+++ etc/celeryconfig_common.py	2014-08-26 12:50:49 +0000
@@ -29,11 +29,9 @@
 
 # ISC dhcpd configuration files.
 DHCP_CONFIG_FILE = '/etc/maas/dhcpd.conf'
-DHCPv6_CONFIG_FILE = '/etc/maas/dhcpd6.conf'
 
 # List of interfaces that the dhcpd should service (if managed by MAAS).
 DHCP_INTERFACES_FILE = '/var/lib/maas/dhcpd-interfaces'
-DHCPv6_INTERFACES_FILE = '/var/lib/maas/dhcpd6-interfaces'
 
 # Broker connection information.  This is read by the region controller
 # and sent to connecting cluster controllers.

=== modified file 'etc/democeleryconfig_common.py'
--- etc/democeleryconfig_common.py	2014-08-22 11:23:35 +0000
+++ etc/democeleryconfig_common.py	2014-08-26 12:50:49 +0000
@@ -37,8 +37,6 @@
 
 DHCP_CONFIG_FILE = os.path.join(
     DEV_ROOT_DIRECTORY, 'run/dhcpd.conf')
-DHCPv6_CONFIG_FILE = os.path.join(
-    DEV_ROOT_DIRECTORY, 'run/dhcpd6.conf')
 
 
 DHCP_LEASES_FILE = os.path.join(

=== modified file 'src/provisioningserver/rpc/dhcp.py'
--- src/provisioningserver/rpc/dhcp.py	2014-08-26 03:25:43 +0000
+++ src/provisioningserver/rpc/dhcp.py	2014-08-26 12:50:49 +0000
@@ -18,7 +18,6 @@
     "remove_host_maps",
 ]
 
-from celery.app import app_or_default
 from provisioningserver.dhcp.config import get_config
 from provisioningserver.dhcp.control import (
     restart_dhcpv6,
@@ -37,8 +36,11 @@
 
 maaslog = get_maas_logger("dhcp")
 
+# Location of the DHCPv6 configuration file.
+DHCPv6_CONFIG_FILE = '/etc/maas/dhcp6.conf'
 
-celery_config = app_or_default().conf
+# Location of the DHCPv6 interfaces file.
+DHCPv6_INTERFACES_FILE = '/var/lib/maas/dhcpd6-interfaces'
 
 
 def configure_dhcpv6(omapi_key, subnet_configs):
@@ -56,8 +58,8 @@
         'dhcpd6.conf.template',
         omapi_key=omapi_key, dhcp_subnets=subnet_configs)
     try:
-        sudo_write_file(celery_config.DHCPv6_CONFIG_FILE, dhcpd_config)
-        sudo_write_file(celery_config.DHCPv6_INTERFACES_FILE, interfaces)
+        sudo_write_file(DHCPv6_CONFIG_FILE, dhcpd_config)
+        sudo_write_file(DHCPv6_INTERFACES_FILE, interfaces)
     except ExternalProcessError as e:
         # ExternalProcessError.__unicode__ contains a generic failure message
         # as well as the command and its error output.  On the other hand,

=== modified file 'src/provisioningserver/rpc/tests/test_dhcp.py'
--- src/provisioningserver/rpc/tests/test_dhcp.py	2014-08-25 11:08:45 +0000
+++ src/provisioningserver/rpc/tests/test_dhcp.py	2014-08-26 12:50:49 +0000
@@ -95,8 +95,7 @@
 
         self.assertThat(
             write_file,
-            MockAnyCall(
-                dhcp.celery_config.DHCPv6_CONFIG_FILE, expected_config))
+            MockAnyCall(dhcp.DHCPv6_CONFIG_FILE, expected_config))
 
     def test__writes_interfaces_file(self):
         write_file = self.patch_sudo_write_file()
@@ -104,7 +103,7 @@
         dhcp.configure_dhcpv6(factory.make_name('key'), [make_subnet_config()])
         self.assertThat(
             write_file,
-            MockCalledWith(dhcp.celery_config.DHCPv6_INTERFACES_FILE, ANY))
+            MockCalledWith(dhcp.DHCPv6_INTERFACES_FILE, ANY))
 
     def test__restarts_dhcpv6_server_if_subnets_defined(self):
         self.patch_sudo_write_file()