diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-01 06:56:54 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-01 06:56:54 +0000 |
| commit | a51a7c2ea08f9c55a0d828805fd292fa1d14d5a0 (patch) | |
| tree | d0aba93f63c252754290a1a9afa6de5c911ebf9d /devstack/tools/ironic/scripts | |
| parent | 502d8c301113cfc0367b85eb0ed7e50a0e1277d8 (diff) | |
| parent | 24955b21255f1e94fb022ddff61a7971514ac4d5 (diff) | |
| download | ironic-a51a7c2ea08f9c55a0d828805fd292fa1d14d5a0.tar.gz | |
Merge "[Devstack]Add ability to enable ironic node pty console"
Diffstat (limited to 'devstack/tools/ironic/scripts')
| -rwxr-xr-x | devstack/tools/ironic/scripts/configure-vm.py | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/devstack/tools/ironic/scripts/configure-vm.py b/devstack/tools/ironic/scripts/configure-vm.py index 4fc252813..51cee5fbf 100755 --- a/devstack/tools/ironic/scripts/configure-vm.py +++ b/devstack/tools/ironic/scripts/configure-vm.py @@ -41,6 +41,16 @@ CONSOLE_LOG = """ """ +CONSOLE_PTY = """ + <serial type='pty'> + <target port='0'/> + </serial> + <console type='pty'> + <target type='serial' port='0'/> + </console> +""" + + def main(): parser = argparse.ArgumentParser( description="Configure a kvm virtual machine for the seed image.") @@ -91,11 +101,9 @@ def main(): params['emulator'] = "/usr/bin/qemu-kvm" if args.console_log: - params['bios_serial'] = "<bios useserial='yes'/>" - params['console_log'] = CONSOLE_LOG % {'console_log': args.console_log} + params['console'] = CONSOLE_LOG % {'console_log': args.console_log} else: - params['bios_serial'] = '' - params['console_log'] = '' + params['console'] = CONSOLE_PTY libvirt_template = source_template % params conn = libvirt.open("qemu:///system") |