Merge lp:~nuclearbob/utah/cobbler-desktop into lp:utah

[Max Brustkern]

This branch adds support for mini and desktop images to the CobblerMachine class. Desktop images currently require nfs, and are configured via the nfs options in the updated config.py. I haven't yet incorporated a dependency or check for nfs, so feedback on the ideal way to do that would be welcome. I've tested both types in magners-orchestra. Currently, the desktop install requires this latecommand:
chroot /target apt-get update
To get python-jsonschema from the PPA correctly in magners-orchestra, but once we have a different fix in place for that, we won't need that in the preseed anymore.

[Joe Talbott (joetalbott)]

Looks good to me.

review: Approve

=== modified file 'utah/config.py'
--- utah/config.py	2012-08-22 15:20:25 +0000
+++ utah/config.py	2012-09-07 14:03:40 +0000
@@ -42,6 +42,9 @@
     machineid=None,
     name=None,
     new=False,
+    nfscommand=['sudo', os.path.join('/', 'etc', 'init.d', 'nfs-kernel-server'), 'reload'],
+    nfsconfigfile=os.path.join('/', 'etc', 'exports'),
+    nfsoptions='*(ro,async,no_root_squash,no_subtree_check)',
     powertimeout=5,
     preseed=None,
     qemupath='qemu:///system',
@@ -55,6 +58,7 @@
 """
 LOCALDEFAULTS = dict(
     bridge=getbridge(),
+    hostname=socket.gethostname(),
     sshprivatekey=os.path.join(os.path.expanduser('~'), '.ssh', 'utah'),
     sshpublickey=os.path.join(os.path.expanduser('~'), '.ssh', 'utah.pub'),
     sshknownhosts=os.path.join(os.path.expanduser('~'), '.ssh', 'known_hosts'),
@@ -66,9 +70,9 @@
 These depend on other config options, so they're added last.
 """
 LOCALDEFAULTS['logfile'] = os.path.join(DEFAULTS['logpath'],
-                                        socket.gethostname() + '.log')
+                                        LOCALDEFAULTS['hostname'] + '.log')
 LOCALDEFAULTS['debuglog'] = os.path.join(DEFAULTS['logpath'],
-                                        socket.gethostname() + '-debug.log')
+                                    LOCALDEFAULTS['hostname'] + '-debug.log')
 
 DEFAULTS.update(LOCALDEFAULTS)
 
 
=== modified file 'utah/provisioning/baremetal/cobbler.py'
--- utah/provisioning/baremetal/cobbler.py	2012-08-30 08:34:34 +0000
+++ utah/provisioning/baremetal/cobbler.py	2012-09-07 14:03:40 +0000
@@ -2,7 +2,9 @@
 Support bare metal provisioning through cobbler.
 """
 
+import netifaces
 import os
+import pipes
 import shutil
 import tempfile
 import time
@@ -42,17 +44,14 @@
                     'Image file required for cobbler installation')
         self._custominit(arch=self.arch, boot=boot,
                          installtype=self.installtype, series=self.series)
-        # TODO: support mini,
-        # then desktop once we can figure out how
+        # TODO: verify we have nfs support for desktop image
+
+        # TODO: Rework cinitrd to be less of a confusing collection of kludges
         self.cinitrd = None
         if self.installtype in ['alternate', 'server']:
             self.cinitrd = os.path.join('install', 'netboot',
                                         'ubuntu-installer', self.arch,
                                         'initrd.gz')
-        else:
-            raise UTAHBMProvisioningException(
-                    'Only alternate and server images currently supported '
-                    'for cobbler provisioning')
         if self.arch == 'amd64':
             self.carch = 'x86_64'
         else:
@@ -72,19 +71,34 @@
 
         # TODO: try to remove this step, mount the iso and import that
         # with a specified kernel/preseed/initrd from the tmpdir
-        self.logger.info('Extracting image to ' + self.tmpdir)
-        self.image.extractall()
+        if self.installtype in ['alternate', 'desktop', 'server']:
+            self.logger.info('Extracting image to ' + self.tmpdir)
+            self.image.extractall()
 
-        self._preparekernel()
-        cinitrd = os.path.join(self.tmpdir, self.cinitrd)
+        kernel = self._preparekernel()
+        if self.cinitrd is None:
+            cinitrd = None
+        else:
+            cinitrd = os.path.join(self.tmpdir, self.cinitrd)
         initrd = self._prepareinitrd(initrd=cinitrd)
         self._unpackinitrd(initrd=initrd)
         self._setuplatecommand()
+        if self.installtype == 'desktop':
+            self.logger.info('Configuring latecommand for desktop')
+            myfile = open(os.path.join(self.tmpdir, 'initrd.d',
+                          'utah-latecommand'), 'a')
+            myfile.write(
+"""
+chroot /target sh -c 'sed "/eth[0-9]/d" -i /etc/network/interfaces'
+cp /etc/resolv.conf /target/etc/resolv.conf
+""")
+            myfile.close()
         self._setuppreseed()
         initrd = self._repackinitrd()
 
-        os.chmod(cinitrd, 0755)
-        shutil.copyfile(initrd, cinitrd)
+        if cinitrd is not None and initrd != cinitrd:
+            os.chmod(cinitrd, 0755)
+            shutil.copyfile(initrd, cinitrd)
 
         self.logger.info('Setting up system with cobbler')
         self.logger.debug('Removing old system')
@@ -93,28 +107,67 @@
         self._cobble(['profile', 'remove', '--name=' + self.cname])
         self.logger.info('Removing old distro')
         self._cobble(['distro', 'remove', '--name=' + self.cname])
-        # TODO: support more image types, maybe do this without unpacking ISO
-        self.logger.info('Importing image')
-        self._cobble(['import', '--name=' + self.cname,
-                      '--path=' + self.tmpdir, '--arch=' + self.carch])
-        # TODO: figure out if I need kopts in both places
+
+        preseed = os.path.join(self.tmpdir, 'initrd.d', 'preseed.cfg')
+
+        if self.installtype in ['alternate', 'server']:
+            # TODO: support more image types,
+            # maybe do this without unpacking ISO
+            self.logger.info('Importing image')
+            self._cobble(['import', '--name=' + self.cname,
+                          '--path=' + self.tmpdir, '--arch=' + self.carch])
+        elif self.installtype in ['mini', 'desktop']:
+            self.logger.info('Creating distro')
+            self._cobble(['distro', 'add', '--name=' + self.cname,
+                          '--kernel=' + kernel, '--initrd=' + initrd])
+            self.logger.info('Creating profile')
+            self._cobble(['profile', 'add', '--name=' + self.cname,
+                          '--distro=' + self.cname])
+
+        if self.installtype == 'desktop':
+            self.logger.info('Setting up NFS for desktop install')
+            self.logger.debug('Adding export to NFS config file')
+#            nfsfile = open(config.nfsconfigfile, 'a')
+#            nfsfile.write("\n" + self.tmpdir + ' ' + config.nfsoptions + "\n")
+#            nfsfile.close()
+            pipe = pipes.Template()
+            pipe.append('sudo tee -a ' + config.nfsconfigfile + ' >/dev/null',
+                        '-.')
+            pipe.open('/dev/null', 'w').write(self.tmpdir + ' ' +
+                      config.nfsoptions + "\n")
+            self.logger.debug('Reloading NFS config')
+            self._runargs(config.nfscommand)
+            self.logger.debug('Adding NFS boot options')
+            try:
+                iface = config.nfsiface
+            except AttributeError:
+                iface = config.bridge
+            ip = netifaces.ifaddresses(iface)[netifaces.AF_INET][0]['addr']
+            self.cmdline += (' root=/dev/nfs netboot=nfs nfsroot=' +
+                             ip + ':' + self.tmpdir)
+            self.cmdline = self.cmdline.strip()
+
         self.logger.info('Adding kernel boot options to distro')
         self._cobble(['distro', 'edit', '--name=' + self.cname,
                       '--kopts=' + self.cmdline])
-        self.logger.info('Adding kernel boot options '
-                          'and kickstart to profile')
-        preseed = os.path.join(self.tmpdir, 'initrd.d', 'preseed.cfg')
+
+        self.logger.info('Adding kickstart to profile')
         self._cobble(['profile', 'edit', '--name=' + self.cname,
-                      '--kickstart=' + preseed,
-                      '--kopts=' + self.cmdline])
+                      '--kickstart=' + preseed])
+
         self.logger.info('Adding system')
         self._cobble(['system', 'add', '--name=' + self.name,
                       '--profile=' + self.cname, '--netboot-enabled=Y']
                       + ['--' + arg + '=' + self.cargs[arg]
                          for arg in self.cargs])
 
-        self.logger.info('Syncing cobbler')
-        self._cobble(['sync'])
+        # Things seem to be working fine without this, but sometimes things still get broken
+        #self.logger.info('Syncing cobbler')
+        #self._cobble(['sync'])
+        try:
+            self._runargs(config.cobblerfix)
+        except AttributeError:
+            pass
         self.restart()
 
         self.logger.info('Waiting for installation to begin')
@@ -122,11 +175,21 @@
         self._cobble(['system', 'edit', '--name=' + self.name,
                       '--netboot-enabled=N'])
 
+        self.logger.info('System installing')
+        self.logger.info('Checking every ' + str(checktimeout) +
+                         ' seconds until system is installed')
+        self.logger.info('Will time out after ' + str(installtimeout)
+                         + ' seconds')
+        retry(self.sshcheck, checktimeout, logmethod=self.logger.info)
+
         if self.debug:
             self.logger.info('Leaving temp directory '
                              'because debug is enabled: ' + self.tmpdir)
         else:
             self.logger.info('Cleaning up temp directory')
+            if self.installtype == 'desktop':
+                self.logger.info('Removing NFS share')
+                self._removenfs()
             # Cribbed from http://svn.python.org
             # /projects/python/trunk/Mac/BuildScript/build-installer.py
             for dirpath, dirnames, filenames in os.walk(self.tmpdir):
@@ -138,12 +201,6 @@
                         os.chmod(filename, 0775)
             shutil.rmtree(self.tmpdir)
 
-        self.logger.info('System installing')
-        self.logger.info('Checking every ' + str(checktimeout) +
-                         ' seconds until system is installed')
-        self.logger.info('Will time out after ' + str(installtimeout)
-                         + ' seconds')
-        retry(self.sshcheck, checktimeout, logmethod=self.logger.info)
         self.provisioned = True
         self.active = True
         uuid_check_command = ('[ "{uuid}" == "$(cat /etc/utah/uuid)" ]'
@@ -204,10 +261,20 @@
         """
         If the machine has an inventory, tell the inventory to release the
         machine when the object is deleted.
+        If we exported a directory over NFS, remove it.
         """
+        if self.installtype == 'desktop':
+            self._removenfs()
         if self.inventory is not None:
             self.inventory.release(machine=self)
 
+    def _removenfs(self):
+        self.logger.info('Removing NFS share')
+        self._runargs(['sudo', 'sed', '/' + self.tmpdir.replace('/', '\/') +
+                       '/d', '-i', config.nfsconfigfile])
+        self.logger.debug('Reloading NFS config')
+        self._runargs(config.nfscommand)
+
     def activecheck(self):
         """
         Start the machine if needed, and check for SSH login.