Disassembler/Spotter-VM
1
0
Fork 0
Code Issues 78 Pull Requests Actions Packages Projects Releases Wiki Activity

Move app configuration to pre-start hook

Browse Source
This commit is contained in:
Disassembler 2018-09-21 16:21:55 +02:00
parent 48492bf405
commit 67caca8171
Signed by: Disassembler
GPG Key ID: 524BD33A0EE29499
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
basic/srv/vm/cli.py
View File

@ -44,9 +44,9 @@ parser_disable_autostart.add_argument('app', help='Application name')
parser_rebuild_issue = subparsers.add_parser('rebuild-issue', help='Rebuilds /etc/issue using current settings - used on VM startup') parser_rebuild_issue = subparsers.add_parser('rebuild-issue', help='Rebuilds /etc/issue using current settings - used on VM startup')
parser_rebuild_issue.set_defaults(action='rebuild-issue') parser_rebuild_issue.set_defaults(action='rebuild-issue')
parser_clean_ephemeral = subparsers.add_parser('clean-ephemeral', help='Cleans container ephemeral layer. Intended to be used with LXC hooks') parser_prepare_container = subparsers.add_parser('prepare-container', help='Cleans container ephemeral layer and sets common config for the app. Intended to be used with LXC hooks')
parser_clean_ephemeral.add_argument('lxc', nargs=argparse.REMAINDER) parser_prepare_container.add_argument('lxc', nargs=argparse.REMAINDER)
parser_clean_ephemeral.set_defaults(action='clean-ephemeral') parser_prepare_container.set_defaults(action='prepare-container')
parser_register_container = subparsers.add_parser('register-container', help='Register and assigns IP to an application container. Intended to be used with LXC hooks') parser_register_container = subparsers.add_parser('register-container', help='Register and assigns IP to an application container. Intended to be used with LXC hooks')
parser_register_container.add_argument('lxc', nargs=argparse.REMAINDER) parser_register_container.add_argument('lxc', nargs=argparse.REMAINDER)
@ -106,8 +106,8 @@ elif args.action == 'disable-autostart':
mgr.disable_autostart(args.app) mgr.disable_autostart(args.app)
elif args.action == 'rebuild-issue': elif args.action == 'rebuild-issue':
mgr.rebuild_issue() mgr.rebuild_issue()
elif args.action == 'clean-ephemeral': elif args.action == 'prepare-container':
mgr.clean_ephemeral() mgr.prepare_container()
elif args.action == 'register-container': elif args.action == 'register-container':
mgr.register_container() mgr.register_container()
elif args.action == 'unregister-container': elif args.action == 'unregister-container':

8
basic/srv/vm/mgr/__init__.py
View File

@ -210,18 +210,18 @@ class VMMgr:
raise validator.InvalidValueException('app', app) raise validator.InvalidValueException('app', app)
subprocess.run(['/sbin/rc-update', 'del', app]) subprocess.run(['/sbin/rc-update', 'del', app])
def clean_ephemeral(self): def prepare_container(self):
# Extract the variables from values given via lxc.hook.pre-start or lxc.hook.post-stop hook # Extract the variables from values given via lxc.hook.pre-start hook
app = os.environ['LXC_NAME'] app = os.environ['LXC_NAME']
# Remove ephemeral layer data # Remove ephemeral layer data
tools.clean_ephemeral_layer(app) tools.clean_ephemeral_layer(app)
# Configure host and common params used in the app
self.configure_app(app)
def register_container(self): def register_container(self):
# Extract the variables from values given via lxc.hook.start-host hook # Extract the variables from values given via lxc.hook.start-host hook
app = os.environ['LXC_NAME'] app = os.environ['LXC_NAME']
pid = os.environ['LXC_PID'] pid = os.environ['LXC_PID']
# Configure host and common params used in the app
self.configure_app(app)
# Lease the first unused IP to the container # Lease the first unused IP to the container
ip = tools.get_unused_ip() ip = tools.get_unused_ip()
tools.update_hosts_lease(ip, app) tools.update_hosts_lease(ip, app)

2
zz-extra/lxc-build
View File

@ -43,7 +43,7 @@ lxc.console.logfile = /var/log/lxc/{name}.log
# Other # Other
lxc.arch = x86_64 lxc.arch = x86_64
lxc.cap.drop = sys_admin lxc.cap.drop = sys_admin
lxc.hook.pre-start = /usr/bin/vmmgr clean-ephemeral lxc.hook.pre-start = /usr/bin/vmmgr prepare-container
lxc.hook.start-host = /usr/bin/vmmgr register-container lxc.hook.start-host = /usr/bin/vmmgr register-container
lxc.hook.post-stop = /usr/bin/vmmgr unregister-container lxc.hook.post-stop = /usr/bin/vmmgr unregister-container
lxc.include = /usr/share/lxc/config/common.conf lxc.include = /usr/share/lxc/config/common.conf