kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-22 09:50:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

New plugin: "packages"

Browse source 
It combines features from the user_packages and backports plugin,
so they are not needed any longer.
This commit is contained in:
Anders Ingemann 2013-11-30 22:37:51 +01:00
parent 637f49904a
commit 6138f88ab9
14 changed files with 180 additions and 191 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/task_sets.py
View file

@ -47,6 +47,7 @@ ssh_set = [security.DisableSSHPasswordAuthentication,
apt_set = [apt.DisableDaemonAutostart,
apt.AptSources,
apt.AptUpdate,
apt.AptUpgrade,
apt.PurgeUnusedPackages,
apt.AptClean,

17
common/tasks/apt.py
View file

@ -39,10 +39,25 @@ class DisableDaemonAutostart(Task):
stat.S_IROTH | stat.S_IXOTH)
class AptUpdate(Task):
description = 'Updating the package cache'
phase = phases.system_modification
predecessors = [locale.GenerateLocale, AptSources]
successors = [network.RemoveDNSInfo]
def run(self, info):
log_check_call(['/usr/sbin/chroot', info.root, '/usr/bin/apt-get', 'update'])
log_check_call(['/usr/sbin/chroot', info.root, '/usr/bin/apt-get',
'--fix-broken',
'--assume-yes',
'install'])
log_check_call(['/usr/sbin/chroot', info.root, '/usr/bin/apt-get', '--assume-yes', 'upgrade'])
class AptUpgrade(Task):
description = 'Upgrading packages and fixing broken dependencies'
phase = phases.system_modification
predecessors = [locale.GenerateLocale, AptSources, DisableDaemonAutostart]
predecessors = [AptUpdate, DisableDaemonAutostart]
successors = [network.RemoveDNSInfo]
def run(self, info):

17
manifests/ec2-ebs-debian-official-i386-pvm.manifest.json
View file

@ -31,12 +31,17 @@
}
},
"plugins": {
"backports": {
"packages": [ "cloud-init" ]
},
"user_packages": {
"repo": [ "sudo" ],
"local": []
"packages": {
"sources": {
"backports": [
"deb {apt_mirror} {release}-backports main",
"deb-src {apt_mirror} {release}-backports main"
]
},
"remote": [
"sudo",
{ "name": "cloud-init", "target": "{release}-backports" }
]
},
"sed": {
"file": "etc/cloud/cloud.cfg",

17
manifests/ec2-ebs-debian-official.manifest.json
View file

@ -31,12 +31,17 @@
}
},
"plugins": {
"backports": {
"packages": [ "cloud-init" ]
},
"user_packages": {
"repo": [ "sudo" ],
"local": []
"packages": {
"sources": {
"backports": [
"deb {apt_mirror} {release}-backports main",
"deb-src {apt_mirror} {release}-backports main"
]
},
"remote": [
"sudo",
{ "name": "cloud-init", "target": "{release}-backports" }
]
},
"sed": {
"file": "etc/cloud/cloud.cfg",

12
plugins/backports/__init__.py
View file

@ -1,12 +0,0 @@
def tasks(tasklist, manifest):
import tasks
tasklist.add(tasks.AptSourcesBackports,
tasks.AddBackportsPackages)
def validate_manifest(data, schema_validate):
from os import path
schema_path = path.normpath(path.join(path.dirname(__file__), 'manifest-schema.json'))
schema_validate(data, schema_path)

26
plugins/backports/manifest-schema.json
View file

@ -1,26 +0,0 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Backports setup and package install",
"type": "object",
"properties": {
"plugins": {
"type": "object",
"properties": {
"backports": {
"type": "object",
"properties": {
"packages": {
"type": "array",
"items": {
"type": "string"
}
}
},
"required": ["packages"]
}
},
"required": ["backports"]
}
},
"required": ["plugins"]
}

38
plugins/backports/tasks.py
View file

@ -1,38 +0,0 @@
from base import Task
from common import phases
from common.tasks.packages import ImagePackages
from common.tasks.initd import InstallInitScripts
from common.tasks.apt import AptUpgrade
from common.tasks.apt import AptSources
import os
class AptSourcesBackports(Task):
description = 'Adding backports to sources.list'
phase = phases.system_modification
predecessors = [AptSources]
successors = [AptUpgrade]
def run(self, info):
sources_path = os.path.join(info.root, 'etc/apt/sources.list')
with open(sources_path, 'a') as apt_sources:
apt_sources.write(('deb {apt_mirror} {release}-backports main\n'
'deb-src {apt_mirror} {release}-backports main\n'
.format(apt_mirror='http://http.debian.net/debian',
release=info.manifest.system['release'])))
class AddBackportsPackages(Task):
description = 'Adding backport packages to the image'
phase = phases.system_modification
predecessors = [AptUpgrade]
def run(self, info):
if 'packages' not in info.manifest.plugins['backports']:
return
from common.tools import log_check_call
for pkg in info.manifest.plugins['backports']['packages']:
log_check_call(['/usr/sbin/chroot', info.root, '/usr/bin/apt-get', 'install',
'--assume-yes', '--target-release', info.manifest.system['release'] + '-backports',
pkg])

16
plugins/packages/__init__.py Normal file
View file

@ -0,0 +1,16 @@
def validate_manifest(data, schema_validate):
from os import path
schema_path = path.normpath(path.join(path.dirname(__file__), 'manifest-schema.json'))
schema_validate(data, schema_path)
def tasks(tasklist, manifest):
from tasks import AptSources, InstallRemotePackages, InstallLocalPackages
if 'sources' in manifest.plugins['packages']:
tasklist.add(AptSources)
if 'remote' in manifest.plugins['packages']:
tasklist.add(InstallRemotePackages)
if 'local' in manifest.plugins['packages']:
tasklist.add(InstallLocalPackages)

62
plugins/packages/manifest-schema.json Normal file
View file

@ -0,0 +1,62 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Packages plugin manifest",
"type": "object",
"properties": {
"plugins": {
"type": "object",
"properties": {
"packages": {
"type": "object",
"properties": {
"sources": {
"type": "object",
"patternProperties": {
"^\\w+$": {
"type": "array",
"items": {"type": "string"},
"minItems": 1
}
},
"additionalProperties": false,
"minItems": 1
},
"remote": {
"type": "array",
"items": {
"anyOf": [
{
"type": "object",
"properties": {
"name": {"type": "string"},
"target": {"type": "string"}
},
"required": ["name"]
},
{ "type": "string" }
]
},
"minItems": 1
},
"local": {
"type": "array",
"items": { "$ref": "#/definitions/absolute_path" },
"minItems": 1
}
},
"anyOf": [
{"required": ["sources"]},
{"required": ["remote"]},
{"required": ["local"]}
]
}
}
}
},
"definitions": {
"absolute_path": {
"type": "string",
"pattern": "^/[^\\0]+$"
}
}
}

63
plugins/packages/tasks.py Normal file
View file

@ -0,0 +1,63 @@
from base import Task
from common import phases
from common.tasks import network
from common.tasks import apt
import os.path
class AptSources(Task):
description = 'Adding additional aptitude sources'
phase = phases.system_modification
predecessors = [apt.AptSources]
successors = [apt.AptUpdate]
def run(self, info):
manifest_vars = {'release': info.manifest.system['release'],
'architecture': info.manifest.system['architecture'],
'apt_mirror': 'http://http.debian.net/debian'}
for name in info.manifest.plugins['packages']['sources'].iterkeys():
list_path = os.path.join(info.root, 'etc/apt/sources.list.d/', name + '.list')
with open(list_path, 'a') as source_list:
for line in info.manifest.plugins['packages']['sources'][name]:
source_list.write('{line}\n'.format(line=line.format(**manifest_vars)))
class InstallRemotePackages(Task):
description = 'Installing remote packages'
phase = phases.system_modification
predecessors = [apt.AptUpdate, apt.DisableDaemonAutostart]
successors = [network.RemoveDNSInfo]
def run(self, info):
manifest_vars = {'release': info.manifest.system['release'],
'architecture': info.manifest.system['architecture']}
from common.tools import log_check_call
for package in info.manifest.plugins['packages']['remote']:
target_release = []
if isinstance(package, basestring):
name = package
else:
name = package['name'].format(**manifest_vars)
if hasattr(package, 'target'):
target = package['target'].format(**manifest_vars)
target_release = ['--targe-release', target]
log_check_call(['/usr/sbin/chroot', info.root, '/usr/bin/apt-get', 'install',
'--assume-yes'] + target_release + [name])
class InstallLocalPackages(Task):
description = 'Installing local packages'
phase = phases.system_modification
def run(self, info):
from shutil import copy
from os import remove
from common.tools import log_check_call
for package_src in info.manifest.plugins['packages']['local']:
pkg_name = os.path.basename(package_src)
package_dst = os.path.join('/tmp', pkg_name)
copy(package_src, os.path.join(info.root, package_dst))
log_check_call(['/usr/sbin/chroot', info.root,
'/usr/bin/dpkg', '--install', package_dst])
remove(package_dst)

14
plugins/user_packages/README.md
View file

@ -1,14 +0,0 @@
# User package plugin
This plugin gives the possibility to the user to install Debian packages in the virtual image.
Plugin is defined in the manifest file, plugin section with:
"user_packages": {
"repo": [ "apache2" ],
"local": [ "/tmp/mypackage.deb" ]
}
The *repo* element refers to packages available in Debian repository (apt-get).
The *local* element will copy the specified .deb files and install them in the image with a dpkg command. Packages are installed in the order of their declaration.

14
plugins/user_packages/__init__.py
View file

@ -1,14 +0,0 @@
def validate_manifest(data, schema_validate):
from os import path
schema_path = path.normpath(path.join(path.dirname(__file__), 'manifest-schema.json'))
schema_validate(data, schema_path)
def tasks(tasklist, manifest):
from user_packages import AddUserPackages, AddLocalUserPackages
if 'repo' in manifest.plugins['user_packages']:
tasklist.add(AddUserPackages)
if 'local' in manifest.plugins['user_packages']:
tasklist.add(AddLocalUserPackages)

33
plugins/user_packages/manifest-schema.json
View file

@ -1,33 +0,0 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"title": "Image commands plugin manifest",
"type": "object",
"properties": {
"plugins": {
"type": "object",
"properties": {
"user_packages": {
"type": "object",
"properties": {
"repo": {
"type": "array",
"items": {"type": "string"},
"minItems": 1
},
"local": {
"type": "array",
"items": {"type": "string"},
"minItems": 1
}
},
"anyOf": [
{"required": ["repo"]},
{"required": ["local"]}
]
}
},
"required": ["user_packages"]
}
},
"required": ["plugins"]
}

41
plugins/user_packages/user_packages.py
View file

@ -1,41 +0,0 @@
from base import Task
from common import phases
import os
from common.tasks.packages import ImagePackages
from common.tasks.host import CheckPackages
from common.tasks.filesystem import MountRoot
class AddUserPackages(Task):
description = 'Adding user defined packages to the image packages'
phase = phases.preparation
predecessors = [ImagePackages]
successors = [CheckPackages]
def run(self, info):
for pkg in info.manifest.plugins['user_packages']['repo']:
info.img_packages[0].add(pkg)
class AddLocalUserPackages(Task):
description = 'Adding user local packages to the image packages'
phase = phases.system_modification
predecessors = [MountRoot]
def run(self, info):
import stat
rwxr_xr_x = (stat.S_IRUSR | stat.S_IWUSR | stat.S_IXUSR |
stat.S_IRGRP | stat.S_IXGRP |
stat.S_IROTH | stat.S_IXOTH)
from shutil import copy
from common.tools import log_check_call
for pkg in info.manifest.plugins['user_packages']['local']:
script_src = os.path.normpath(pkg)
script_dst = os.path.join(info.root, 'tmp/'+os.path.basename(script_src))
copy(script_src, script_dst)
os.chmod(script_dst, rwxr_xr_x)
log_check_call(['/usr/sbin/chroot', info.root,
'/usr/bin/dpkg', '--install', '/tmp/'+os.path.basename(script_src)])