diff options
| author | Ewan Mellor <ewan.mellor@citrix.com> | 2011-01-17 19:32:34 +0000 |
|---|---|---|
| committer | Ewan Mellor <ewan.mellor@citrix.com> | 2011-01-17 19:32:34 +0000 |
| commit | e8a8b14e6b4604633313ab083821f43ba9b8a64c (patch) | |
| tree | 56fc3f471aff43c61044c69354a42907fe655b5f /nova/cloudpipe | |
| parent | b8c45af21d38e476d8f667089fc03b347d7969e2 (diff) | |
| parent | 8e6684a58eea3ecacdde99e1940d2ae351b8465c (diff) | |
Merged with trunk revno 572.
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) |