diff options
| author | Todd Willey <todd@ansolabs.com> | 2011-01-12 17:35:09 -0500 |
|---|---|---|
| committer | Todd Willey <todd@ansolabs.com> | 2011-01-12 17:35:09 -0500 |
| commit | 038c9c7663ee1a884726521afe181d30ebe00cc6 (patch) | |
| tree | da84fd2b309e195854532ead861b45d871d4ee07 /nova/cloudpipe | |
| parent | 6ebf9bb2db0aaad607e35e516bb6d7ffc971c5de (diff) | |
| parent | 67307428d6d6f47f3215f485a1af720013a5c2ae (diff) | |
| download | nova-038c9c7663ee1a884726521afe181d30ebe00cc6.tar.gz nova-038c9c7663ee1a884726521afe181d30ebe00cc6.tar.xz nova-038c9c7663ee1a884726521afe181d30ebe00cc6.zip | |
Merge trunk and handle flagfiles with kid-gloves in nova-api. Rename some flags for clarity.
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) |