summaryrefslogtreecommitdiffstats
path: root/etc/nova
diff options
context:
space:
mode:
authorZhongyue Luo <zhongyue.nah@intel.com>2013-06-13 23:38:03 +0800
committerZhongyue Luo <zhongyue.nah@intel.com>2013-06-14 09:00:04 +0800
commit75172f1d3a07594432162a1cf156e7e3b3a53529 (patch)
treeb5a6a2345356bdc4a39c938503a50731eaabefc4 /etc/nova
parent8781fccec83054ce9d10493b1791a1b8b55b41a5 (diff)
downloadnova-75172f1d3a07594432162a1cf156e7e3b3a53529.tar.gz
nova-75172f1d3a07594432162a1cf156e7e3b3a53529.tar.xz
nova-75172f1d3a07594432162a1cf156e7e3b3a53529.zip
Updates nova.conf.sample
Change-Id: Iabd856748258b224308588f5c54052df2e247a62
Diffstat (limited to 'etc/nova')
-rw-r--r--etc/nova/nova.conf.sample8
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
#