Allow hostname to be set when net is none

cattle/plugins/docker/compute.py

@@ -706,9 +706,12 @@ def _setup_hostname(self, create_config, instance):
     def _setup_networking(self, instance, host, create_config, start_config):
         client = docker_client()
 
-        ports_supported = setup_network_mode(instance, self, client,
-                                             create_config, start_config)
-        setup_mac_and_ip(instance, create_config, set_mac=ports_supported)
+        ports_supported, hostname_supported = setup_network_mode(instance,
+                                                                 self, client,
+                                                                 create_config,
+                                                                 start_config)
+        setup_mac_and_ip(instance, create_config, set_mac=ports_supported,
+                         set_hostname=hostname_supported)
         setup_ports(instance, create_config, start_config, ports_supported)
         setup_links(instance, create_config, start_config)
         setup_ipsec(instance, host, create_config, start_config)

cattle/plugins/docker/network.py

@@ -15,10 +15,12 @@ def setup_network_mode(instance, compute, client, create_config, start_config):
     all other configurations we assume bridge mode
     """
     ports_supported = True
+    hostname_support = True
     try:
         kind = instance.nics[0].network.kind
         if kind == 'dockerHost':
             ports_supported = False
+            hostname_support = False
             start_config['network_mode'] = 'host'
             del start_config['links']
         elif kind == 'dockerNone':
@@ -27,6 +29,7 @@ def setup_network_mode(instance, compute, client, create_config, start_config):
             del start_config['links']
         elif kind == 'dockerContainer':
             ports_supported = False
+            hostname_support = False
             id = instance.networkContainer.uuid
             other = compute.get_container(client, instance.networkContainer)
             if other is not None:
@@ -36,10 +39,10 @@ def setup_network_mode(instance, compute, client, create_config, start_config):
     except (KeyError, AttributeError, IndexError):
         pass
 
-    return ports_supported
+    return ports_supported, hostname_support
 
 
-def setup_mac_and_ip(instance, create_config, set_mac=True):
+def setup_mac_and_ip(instance, create_config, set_mac=True, set_hostname=True):
     """
     Configures the mac address and primary ip address for the the supplied
     container. The mac_address is configured directly as part of the native
@@ -64,7 +67,8 @@ def setup_mac_and_ip(instance, create_config, set_mac=True):
 
     if set_mac:
         create_config["mac_address"] = mac_address
-    else:
+
+    if not set_hostname:
         del create_config['hostname']
 
     try:

tests/test_docker_network.py

@@ -9,11 +9,13 @@ def test_network_mode_none(agent, responses):
     def pre(req):
         instance = req['data']['instanceHostMap']['instance']
         instance['nics'][0]['network']['kind'] = 'dockerNone'
+        instance['hostname'] = 'nameisset'
 
     def post(req, resp):
         instance_data = resp['data']['instanceHostMap']['instance']['+data']
         docker_inspect = instance_data['dockerInspect']
         assert docker_inspect['Config']['NetworkDisabled']
+        assert docker_inspect['Config']['Hostname'] == 'nameisset'
 
     event_test(agent, 'docker/instance_activate', pre_func=pre,
                post_func=post, diff=False)
@@ -26,12 +28,14 @@ def test_network_mode_host(agent, responses):
     def pre(req):
         instance = req['data']['instanceHostMap']['instance']
         instance['nics'][0]['network']['kind'] = 'dockerHost'
+        instance['hostname'] = 'nameisset'
 
     def post(req, resp):
         instance_data = resp['data']['instanceHostMap']['instance']['+data']
         docker_inspect = instance_data['dockerInspect']
         assert not docker_inspect['Config']['NetworkDisabled']
         assert docker_inspect['HostConfig']['NetworkMode'] == 'host'
+        assert docker_inspect['Config']['Hostname'] != 'nameisset'
 
     event_test(agent, 'docker/instance_activate', pre_func=pre,
                post_func=post, diff=False)