Updating docs for Danube

[apex.git] / config / deploy / deploy_settings.yaml

diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml
index e7821f1..c92a175 100644 (file)
--- a/config/deploy/deploy_settings.yaml
+++ b/config/deploy/deploy_settings.yaml
@@ -14,9 +14,9 @@ deploy_options:
   sdn_controller: opendaylight
 
   # Which version of ODL to use. This is only valid if 'opendaylight' was used
-  # above. If 'Boron' is specified, ODL Boron will be used. If no value is specified,
-  # Lithium will be used.
-  #odl_version: Boron
+  # above. Valid options are 'beryllium', 'boron' and 'carbon'. If no value
+  # is specified, Beryllium will be used.
+  #odl_version: boron
 
   # Whether to configure ODL L3 support. This will disable the Neutron L3 Agent and
   # use ODL instead.
@@ -41,6 +41,10 @@ deploy_options:
   # 'ovs', 'ovs_dpdk' and 'fdio'.
   dataplane : ovs
 
+  # Whether to run the kvm real time kernel (rt_kvm) in the compute node(s) to
+  # reduce the network latencies caused by network function virtualization
+  rt_kvm: false
+
   # Whether to install and configure fdio functionality in the overcloud
   # The dataplane should be specified as fdio if this is set to true
   vpp: false
@@ -48,6 +52,13 @@ deploy_options:
   # Whether to run vsperf after the install has completed
   #vsperf: false
 
+  # Specify a device for ceph to use for the OSDs. By default a virtual disk
+  # is created for the OSDs. This setting allows you to specify a different
+  # target for the OSDs. The setting must be valid on all overcloud nodes.
+  # The controllers and the compute nodes all have OSDs setup on them and
+  # therefore this device name must be valid on all overcloud nodes.
+  #ceph_device: /dev/sdb
+
   # Set performance options on specific roles. The valid roles are 'Compute', 'Controller'
   # and 'Storage', and the valid sections are 'kernel' and 'nova'
   #performance:
@@ -70,7 +81,7 @@ deploy_options:
   #      # This is currently the only available option in the nova section. It will
   #      # add the provided string to vcpu_pin_set in nova.conf. This is used to pin
   #      # guest VMs to a set of CPU cores, and is decsribed in more detail here:
-  #      # http://docs.openstack.org/mitaka/config-reference/compute/config-options.html
+  #      # http://docs.openstack.org/newton/config-reference/compute/config-options.html
   #      libvirtpin: 1
   #    kernel:
   #      # On compute nodes, isolcpus is usually used to reserve cores for use either by VMs
@@ -78,3 +89,9 @@ deploy_options:
   #      isolcpus: 0
   #      hugepage: 2M
   #      intel_iommu: 'on'
+
+  # Set yardstick option to install yardstick
+  #yardstick: false
+
+  # Set dovetail option to install dovetail
+  #dovetail: false