OpenStack Compute (nova)

Merge lp:~zulcss/nova/nova-socat into lp:~hudson-openstack/nova/trunk

  1. nova-socat
  2. Merge into trunk
Proposed by Chuck Short
Status: Rejected
Rejected by: Brian Waldon
Proposed branch: lp:~zulcss/nova/nova-socat
Merge into: lp:~hudson-openstack/nova/trunk
Diff against target: 14 lines (+2/-2)
1 file modified
nova/virt/libvirt/connection.py (+2/-2)
To merge this branch: bzr merge lp:~zulcss/nova/nova-socat
Reviewer Review Type Date Requested Status
Jesse Andrews (community) Approve
Review via email: mp+76628@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Vish Ishaya (vishvananda) wrote :

I'm totally ok with defaulting this to netcat, or even hard-coding it to netcat.

lp:~zulcss/nova/nova-socat updated
1618. By Chuck Short

Hardcode netcat, replace socat

Revision history for this message
Chuck Short (zulcss) wrote :

Just hardcode netcat then.

Revision history for this message
Jesse Andrews (anotherjesse) wrote :

lgtm!

review: Approve
Revision history for this message
Brian Waldon (bcwaldon) wrote :

Moved to gerrit: https://review.openstack.org/#change,729

Unmerged revisions

1618. By Chuck Short

Hardcode netcat, replace socat

1617. By Chuck Short

Allow the user to choose whether to use socat or something else

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nova/virt/libvirt/connection.py'
2--- nova/virt/libvirt/connection.py 2011-09-20 10:12:01 +0000
3+++ nova/virt/libvirt/connection.py 2011-09-22 18:15:25 +0000
4@@ -704,8 +704,8 @@
5 token = str(uuid.uuid4())
6 host = instance['host']
7
8- ajaxterm_cmd = 'sudo socat - %s' \
9- % get_pty_for_instance(instance['name'])
10+ ajaxterm_cmd = 'sudo netcat - %s' \
11+ % get_pty_for_instance(instance['name'])
12
13 cmd = ['%s/tools/ajaxterm/ajaxterm.py' % utils.novadir(),
14 '--command', ajaxterm_cmd, '-t', token, '-p', port]