Merge lp:~paolo-de-rosa/curtin/curtin into lp:~curtin-dev/curtin/trunk

[Andres Rodriguez]

Support for apt gpg key in target, adding the key 'apt_mirrors_keys' curtin can import the apt key during the curthooks

[Server Team CI bot (server-team-bot)]

FAILED: Continuous integration, rev:386
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~paolo-de-rosa/curtin/curtin/+merge/292944/+edit-commit-message

https://server-team-jenkins.canonical.com/job/curtin-ci/224/
Executed test runs:
    None: https://server-team-jenkins.canonical.com/job/generic-update-mp/221/console

Click here to trigger a rebuild:
https://server-team-jenkins.canonical.com/job/curtin-ci/224/rebuild

review: Needs Fixing (continuous-integration)

[Scott Moser (smoser)]

Hi, this is being worked at https://code.launchpad.net/~paelzer/curtin/bug-1574113-derived-repositories/+merge/296118
The solution there is to adopt the same apt configuration that cloud-init supports (and modified cloud-init to support adding apt keys by themselves rather than explicitly with a target).

[Scott Moser (smoser)]

I'm going to mark this as 'rejected' only in the sense that we will have another solution shortly that will cover the same need. Thank you for your contribution.

Unmerged revisions

386. By Paolo de Rosa on 2016-04-26

fix indenteation

385. By Paolo de Rosa on 2016-04-24

fix join syntax

384. By Paolo de Rosa on 2016-04-24

small patch to load apt mirrors keys

=== modified file 'curtin/commands/curthooks.py'
--- curtin/commands/curthooks.py	2016-04-17 22:35:20 +0000
+++ curtin/commands/curthooks.py	2016-04-26 13:51:39 +0000
@@ -130,6 +130,13 @@
         if content is not None:
             util.write_file(sources_list, content)
 
+    if isinstance(cfg.get('apt_mirrors_keys'), dict):
+        for name, key in cfg['apt_mirrors_keys'].items():
+            tgt_kfile = os.path.sep.join(['/tmp', name + '.gpg'])
+            kfile = os.path.sep.join([target, tgt_kfile])
+            util.write_file(kfile, key)
+            with util.RunInChroot(target) as in_chroot:
+                in_chroot(['sh', '-c', '/usr/bin/apt-key add ' + tgt_kfile])
 
 def disable_overlayroot(cfg, target):
     # cloud images come with overlayroot, but installed systems need disabled