kevinheyer/bootstrap-vz
1
0
Fork 0
mirror of https://github.com/kevingruesser/bootstrap-vz.git synced 2025-08-24 15:36:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #90 from JamesBromberger/python

Browse source 
manifest and admin user plugin fixes
This commit is contained in:
Anders Ingemann 2013-08-15 15:29:17 -07:00
commit be9744ce5c
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
manifests/ec2-ebs-pvm.manifest.json
View file

@ -8,10 +8,10 @@
"bootstrapper": { "bootstrapper": {
"mount_dir": "/target", "mount_dir": "/target",
"mirror": "http://http.debian.net/" "mirror": "http://http.debian.net/debian"
}, },
"image": { "image": {
"name": "debian-{release}-{architecture}-{virtualization}-{%y}{%m}{%d}", "name": "debian-{release}-{architecture}-{virtualization}-{%Y}{%m}{%d}",
"description": "Debian {release} {architecture} AMI ({virtualization})" "description": "Debian {release} {architecture} AMI ({virtualization})"
}, },
"system": { "system": {
@ -28,7 +28,8 @@
}, },
"plugins": { "plugins": {
"admin_user": { "admin_user": {
"enabled": false "enabled": true,
"username": "admin"
}, },
"build_metadata": { "build_metadata": {
"enabled": false, "enabled": false,

9
manifests/ec2-s3-pvm.manifest.json
View file

@ -10,10 +10,11 @@
}, },
"bootstrapper": { "bootstrapper": {
"mount_dir": "/target" "mount_dir": "/target",
"mirror": "http://http.debian.net/debian"
}, },
"image": { "image": {
"name": "debian-{release}-{architecture}-{virtualization}-{%y}{%m}{%d}", "name": "debian-{release}-{architecture}-{virtualization}-{%Y}{%m}{%d}",
"description": "Debian {release} {architecture} AMI ({virtualization})" "description": "Debian {release} {architecture} AMI ({virtualization})"
"bucket": "" "bucket": ""
}, },
@ -30,6 +31,10 @@
"size": 1024 "size": 1024
}, },
"plugins": { "plugins": {
"admin_user": {
"enabled": true,
"username": "admin"
},
"prebootstrapped": { "prebootstrapped": {
"enabled": false, "enabled": false,
"image": null "image": null

2
plugins/admin_user/tasks.py
View file

@ -24,7 +24,7 @@ class CreateAdminUser(Task):
from common.tools import log_check_call from common.tools import log_check_call
log_check_call(['/usr/sbin/chroot', info.root, log_check_call(['/usr/sbin/chroot', info.root,
'/usr/sbin/useradd', '/usr/sbin/useradd',
'--create-home', '--shell /bin/bash', '--create-home', '--shell', '/bin/bash',
info.manifest.plugins['admin_user']['username']]) info.manifest.plugins['admin_user']['username']])