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

[Max Brustkern]

Add support for mini/netboot images to CobblerMachine. I've tested this in magners-orchestra with good results.

[Javier Collado (javier.collado)]

In the following piece of code:

          if self.installtype in ['alternate', 'server']:
              self.cinitrd = os.path.join('install', 'netboot',
                                          'ubuntu-installer', self.arch,
                                          'initrd.gz')
          elif self.installtype != 'mini':
              raise UTAHBMProvisioningException(
                      'Only alternate and server images currently supported '
                      'for cobbler provisioning')

I think the error message should be updated to include `mini` images as well since they are supported at least from what I've seen.

Also, even if the changes look good, I don't know how would I test this to exercise the code. Maybe could you provide some information here or offline? Thanks.

[lp:~nuclearbob/utah/cobbler-mini]

679. By Max Brustkern on 2012-08-31

Modified error based on Javier's feedback

[Max Brustkern (nuclearbob)]

Good call. I tested it by logging into the utah user on magners-orchestra, running python, and doing something like this:

from utah.provisioning.inventory.sqlite import ManualCobblerSQLiteInventory
i = ManualCobblerSQLiteInventory(db='~/.utah-cobbler-inventory', lockfile='~/.utah-cobbler-lock')
m = i.request(image='/home/ubuntu/precise-mini-i386.iso', debug=True)
m.installclient()
m.destroy()

Now that I think of it, it should work from the scripts as well, so something like

run_utah_tests.py -m physical --name 'acer-veriton-03' -i '/home/ubuntu/precise-mini-i386.iso' /usr/share/utah/client/examples/pass.run

should also work.

[Javier Collado (javier.collado)]

@Max

What would the prerequisites to test this with a physical machine at home? Do I need any specific hardware or a computer connected to a router is just enough? I tried to create the sqlite database as explained in utah/provisioning/inventory/sqlite.py, but when I run the command I'm asked for the utah password forever, so I must be missing something.

[Max Brustkern (nuclearbob)]

I'm working on a version of this with desktop support, so I'm going to withdraw this proposal and submit that once I've tested it.

review: Disapprove

[lp:~nuclearbob/utah/cobbler-mini]

680. By Max Brustkern on 2012-09-06

Moved directory removal to after installation to facilitate desktop nfs boot

681. By Max Brustkern on 2012-09-06

Added config options for NFS and changed log options to support hostname

682. By Max Brustkern on 2012-09-06

Added an additional nfs config option

683. By Max Brustkern on 2012-09-06

Initial test of NFS stuff

684. By Max Brustkern on 2012-09-06

Fixed typos

685. By Max Brustkern on 2012-09-06

Fixed the typo better

686. By Max Brustkern on 2012-09-06

Fixed typos and did more to ensure removal of tmpdir and nfs share

687. By Max Brustkern on 2012-09-06

Fixed tmpdir to self.tmpdir

688. By Max Brustkern on 2012-09-06

Added image extraction for desktop

689. By Max Brustkern on 2012-09-06

Setting kickstart in profile

690. By Max Brustkern on 2012-09-06

Put restart back in

691. By Max Brustkern on 2012-09-06

Using IP instead of hostname for NFS

692. By Max Brustkern on 2012-09-06

Fixed typo

693. By Max Brustkern on 2012-09-06

Using IP instead of hostname

Unmerged revisions

=== modified file 'utah/provisioning/baremetal/cobbler.py'
--- utah/provisioning/baremetal/cobbler.py	2012-08-24 18:26:16 +0000
+++ utah/provisioning/baremetal/cobbler.py	2012-08-31 19:02:18 +0000
@@ -43,17 +43,18 @@
                     '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: support desktop once we can figure out how
+
+        # 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:
+        elif self.installtype != 'mini':
             raise UTAHBMProvisioningException(
-                    'Only alternate and server images currently supported '
-                    'for cobbler provisioning')
+                    'Only alternate, server, and mini images currently '
+                    'supported for cobbler provisioning')
         if self.arch == 'amd64':
             self.carch = 'x86_64'
         else:
@@ -73,19 +74,24 @@
 
         # 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', '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()
         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')
@@ -94,20 +100,33 @@
         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
-        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')
+
+        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])
+            # TODO: figure out if I need kopts in both places
+            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')
+        elif self.installtype == 'mini':
+            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])
+
         self._cobble(['profile', 'edit', '--name=' + self.cname,
                       '--kickstart=' + preseed,
                       '--kopts=' + self.cmdline])
+
         self.logger.info('Adding system')
         self._cobble(['system', 'add', '--name=' + self.name,
                       '--profile=' + self.cname, '--netboot-enabled=Y']