@@ -1,5 +1,6 @@

 import os

 import commons

+import random

 install_phase = commons.POST_INSTALL

 enabled = True

@@ -7,7 +8,12 @@ enabled = True

 def execute(name, ks_config, config, root):

     if ks_config:

-        config["hostname"] = ks_config["hostname"]

+        if "hostname" in ks_config:

+            config['hostname'] = ks_config["hostname"].strip(" ")

+        if "hostname" not in config or config['hostname'] == "":

+            random_id = '%12x' % random.randrange(16**12)

+            config['hostname'] = "photon-" + random_id.strip()

+

     hostname = config['hostname']

     hostname_file = os.path.join(root, 'etc/hostname')