diff options
| author | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-01-18 12:42:06 -0800 |
|---|---|---|
| committer | Vishvananda Ishaya <vishvananda@gmail.com> | 2011-01-18 12:42:06 -0800 |
| commit | ef9b60f4b8d22f16c0606c5b3c2d2d40d76eac02 (patch) | |
| tree | cd0edbb59607c2b4c68301e3e45efc37dc30da54 /nova/cloudpipe | |
| parent | 47a2dc24b08ca4be7d114d95b42dc4faf19d9fad (diff) | |
| parent | 4577c11923f05ba60ec898186d3f959d86e5de4c (diff) | |
merged trunk
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) |