diff options
| author | Andy Smith <code@term.ie> | 2011-01-18 15:51:13 -0800 |
|---|---|---|
| committer | Andy Smith <code@term.ie> | 2011-01-18 15:51:13 -0800 |
| commit | ac447a687d306af8068bb0b721fe8b61c81d4ff6 (patch) | |
| tree | 6b1ebfcc713c3aa945ad28a9ca218ec4443cb744 /nova/cloudpipe | |
| parent | 9750e4ab3e41d3f4205b0df56ef8200744c327a0 (diff) | |
| parent | b9c96efe7eb7eee62fbc0f2e1568679506468ca9 (diff) | |
merge from upstream and fix small issues
Diffstat (limited to 'nova/cloudpipe')
| -rw-r--r-- | nova/cloudpipe/pipelib.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/nova/cloudpipe/pipelib.py b/nova/cloudpipe/pipelib.py index 8aefd341f..dc6f55af2 100644 --- a/nova/cloudpipe/pipelib.py +++ b/nova/cloudpipe/pipelib.py @@ -68,8 +68,8 @@ class CloudPipe(object): shellfile = open(FLAGS.boot_script_template, "r") s = string.Template(shellfile.read()) shellfile.close() - boot_script = s.substitute(cc_dmz=FLAGS.cc_dmz, - cc_port=FLAGS.cc_port, + boot_script = s.substitute(cc_dmz=FLAGS.ec2_dmz_host, + cc_port=FLAGS.ec2_port, dmz_net=FLAGS.dmz_net, dmz_mask=FLAGS.dmz_mask, num_vpn=FLAGS.cnt_vpn_clients) |