mirror of
https://github.com/kevingruesser/bootstrap-vz.git
synced 2025-08-24 07:26:29 +00:00
c412c4cdcf
- GCE provider wasn't including the GCE SetHostname task, without which https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=604883 was preventing the hostname from getting set after reboot. - During the GCE build, one of the GCE cleaning tasks was trying to run an apt-get update after the build-time resolv.conf file was removed. Fix this ordering by moving the network.Remove* tasks to the system_cleaning phase as they should have been all along, and adding an appropriate ordering rule for the GCE cleaning task. - Add the fallback http.debian.net mirror after, not before, our mirror. - The puppet plugin's ApplyPuppetManifest task specified that it should run before the network.Remove* tasks within the system_modification phase. Now that those tasks have been moved to a later phase (system_cleaning), remove this dependency. I have no puppet manifest to test this change, but am including it in hopes of avoiding a breakage there. Hopefully someone who uses puppet can test this or at least confirm that it's correct. Change-Id: Ieca97f288f456bab119989f4cbc4c3993a755830
57 lines
2.3 KiB
Python
57 lines
2.3 KiB
Python
from bootstrapvz.base import Task
|
|
from bootstrapvz.common import phases
|
|
from bootstrapvz.common.tasks import apt
|
|
from bootstrapvz.common.tasks import network
|
|
from bootstrapvz.common.tools import log_check_call
|
|
import os
|
|
|
|
|
|
class SetPackageRepositories(Task):
|
|
description = 'Adding apt sources'
|
|
phase = phases.preparation
|
|
predecessors = [apt.AddManifestSources]
|
|
|
|
@classmethod
|
|
def run(cls, info):
|
|
components = 'main'
|
|
if 'components' in info.manifest.system:
|
|
components = ' '.join(info.manifest.system['components'])
|
|
info.source_lists.add('main', 'deb http://http.debian.net/debian {system.release} ' + components)
|
|
info.source_lists.add('main', 'deb-src http://http.debian.net/debian {system.release} ' + components)
|
|
info.source_lists.add('backports', 'deb http://http.debian.net/debian {system.release}-backports ' + components)
|
|
info.source_lists.add('backports', 'deb-src http://http.debian.net/debian {system.release}-backports ' + components)
|
|
info.source_lists.add('goog', 'deb http://goog-repo.appspot.com/debian pigeon main')
|
|
|
|
|
|
class ImportGoogleKey(Task):
|
|
description = 'Adding Google key'
|
|
phase = phases.package_installation
|
|
predecessors = [apt.InstallTrustedKeys]
|
|
successors = [apt.WriteSources]
|
|
|
|
@classmethod
|
|
def run(cls, info):
|
|
key_file = os.path.join(info.root, 'google.gpg.key')
|
|
log_check_call(['wget', 'https://goog-repo.appspot.com/debian/key/public.gpg.key', '-O', key_file])
|
|
log_check_call(['chroot', info.root, 'apt-key', 'add', 'google.gpg.key'])
|
|
os.remove(key_file)
|
|
|
|
|
|
class CleanGoogleRepositoriesAndKeys(Task):
|
|
description = 'Removing Google key and apt source files'
|
|
phase = phases.system_cleaning
|
|
successors = [apt.AptClean, network.RemoveDNSInfo]
|
|
|
|
@classmethod
|
|
def run(cls, info):
|
|
keys = log_check_call(['chroot', info.root, 'apt-key',
|
|
'adv', '--with-colons', '--list-keys'])
|
|
# protect against first lines with debug information,
|
|
# not apt-key output
|
|
key_id = [key.split(':')[4] for key in keys
|
|
if len(key.split(':')) == 13 and
|
|
key.split(':')[9].find('@google.com') > 0]
|
|
log_check_call(['chroot', info.root, 'apt-key', 'del', key_id[0]])
|
|
apt_file = os.path.join(info.root, 'etc/apt/sources.list.d/goog.list')
|
|
os.remove(apt_file)
|
|
log_check_call(['chroot', info.root, 'apt-get', 'update'])
|