diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-06-18 22:05:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-06-18 22:05:40 +0000 |
| commit | c05fbc27c1d324a2f8182f31e76d341a11b0f3ac (patch) | |
| tree | 8a5cc729179dc9c54ab0a0a710602253b0252706 | |
| parent | 52c6855bd786c7d15f5130fe38a1cffa2f4c25cc (diff) | |
| parent | 75172f1d3a07594432162a1cf156e7e3b3a53529 (diff) | |
Merge "Updates nova.conf.sample"
| -rw-r--r-- | etc/nova/nova.conf.sample | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/nova/nova.conf.sample b/etc/nova/nova.conf.sample index 7524a7e5e..9e095cb29 100644 --- a/etc/nova/nova.conf.sample +++ b/etc/nova/nova.conf.sample @@ -515,8 +515,8 @@ # (string value) #vpn_image_id=0 -# Instance type for vpn instances (string value) -#vpn_instance_type=m1.tiny +# Flavor for vpn instances (string value) +#vpn_flavor=m1.tiny # Template for cloudpipe instance boot script (string value) #boot_script_template=$pybasedir/nova/cloudpipe/bootscript.template @@ -641,8 +641,8 @@ # Options defined in nova.compute.flavors # -# default instance type to use, testing only (string value) -#default_instance_type=m1.small +# default flavor to use, testing only (string value) +#default_flavor=m1.small # |