X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=config%2Fdeploy%2Fdeploy_settings.yaml;h=caef2628214face24f43b0ce0386bc4336f19cd0;hb=10c4d35315d7ffd909520a1c7bc6a3b5b9b871ab;hp=7406fe6f5ce0692ca374d59028feb653eb1d8b73;hpb=95ee731525170e8dd4df813d5ca7e43b0ba2f4eb;p=apex.git

diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml
index 7406fe6f..caef2628 100644
--- a/config/deploy/deploy_settings.yaml
+++ b/config/deploy/deploy_settings.yaml
@@ -7,21 +7,26 @@
 # If ha_enabled is false, there will only be one controller.
 global_params:
   ha_enabled: true
+  # introspect defaults to True,
+  # Enables/disables the introspection process at deploy time.
+  introspect: true
+  # ipxe defaults to True
+  # Enables/disables the use of ipxe for provisioning
+  ipxe: true
 
 deploy_options:
+  # Whether or not to use containers for the overcloud services
+  containers: true
+
   # Which SDN controller to use. Valid options are 'opendaylight', 'onos',
   # 'opendaylight-external', 'opencontrail' or false. A value of false will
   # use Neutron's OVS ML2 controller.
   sdn_controller: opendaylight
 
   # Which version of ODL to use. This is only valid if 'opendaylight' was used
-  # above. Valid options are 'carbon'. If no value
-  # is specified, carbon will be used.
-  # odl_version: carbon
-
-  # Whether to configure ODL L3 support. This will disable the Neutron L3 Agent
-  # and use ODL instead.
-  sdn_l3: false
+  # above. Valid options are 'nitrogen', 'oxygen'. If no value
+  # is specified, nitrogen will be used.
+  # odl_version: nitrogen
 
   # Whether to install and configure Tacker (VNF Manager)
   tacker: true
@@ -50,6 +55,11 @@ deploy_options:
   # The dataplane should be specified as fdio if this is set to true
   vpp: false
 
+  # Whether to install and configure SRIOV service in the compute node(s) to
+  # allow VMs to use VFs/PFs. The user must know in advance the name of the
+  # SRIOV capable NIC that will be configured.
+  sriov: em2
+
   # Whether to run vsperf after the install has completed
   # vsperf: false
 
@@ -98,3 +108,8 @@ deploy_options:
 
   # Set dovetail option to install dovetail
   # dovetail: false
+
+  # Whether the nodes are deployed as openstack, kubernetes or openshift nodes
+  # Defaults to openstack.
+  # Possible values are openstack, k8s, openshift
+  vim: 'openstack'