X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=config%2Fdeploy%2Fdeploy_settings.yaml;h=c92a175472cf63ee321f44fd7bc70bbd3271c324;hb=a684f6b753749c355aee06412bd0f22779357089;hp=52d39130bc4a6a195d97f960a5e8df3234806d51;hpb=f79e4a1703ba54008e7049b041600546e0482f75;p=apex.git

diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml
index 52d39130..c92a1754 100644
--- a/config/deploy/deploy_settings.yaml
+++ b/config/deploy/deploy_settings.yaml
@@ -1,28 +1,97 @@
+# The only global parameter at this time is ha_enabled, which will use
+# the tripleo ha architecture described here:
+# https://github.com/beekhof/osp-ha-deploy/blob/master/HA-keepalived.md
+# with 3 controllers by default
+#
+# If ha_enabled is false, there will only be one controller.
 global_params:
   ha_enabled: true
-  network_isolation_settings: network/network-environment-example.yaml
 
 deploy_options:
-  # instack_ip
-  # IP address given to instack on the provisioning network
-  instack_ip: 192.0.2.1
-  # CIDR of provisioning network
-  provisioning_cidr: 192.0.2.0/24
-  # gateway IP of provisioning network
-  provisioning_gateway: 192.0.2.1
-  # IP pool start used for provisioning overcloud nodes
-  provisioning_dhcp_start: 192.0.2.5
-  # IP pool end used for inspecting overcloud nodes
-  provisioning_dhcp_end: 192.0.2.24
-  # IP pool used for inspecting overcloud nodes on the provisioning network
-  provisioning_inspection_iprange: 192.0.2.100,192.0.2.124
+  # 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
-  tacker: false
+
+  # Which version of ODL to use. This is only valid if 'opendaylight' was used
+  # 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.
+  sdn_l3: false
+
+  # Whether to install and configure Tacker (VNF Manager)
+  tacker: true
+
+  # Whether to configure Congress (policy as a service) datasources
+  # Note: Congress is already installed by default
   congress: false
-  # CIDR used to for the external network
-  ext_net_cidr: 192.168.37.0/24
-  # Allocation pools for floating ip addresses on the ext net
-  ext_allocation_pool_start: 192.168.37.50
-  ext_allocation_pool_end: 192.168.37.99
-  # Default Gateway for External Network
-  ext_gateway: 192.168.37.1
+
+  # Whether to configure ODL or ONOS with Service Function Chaining support. This
+  # requires the opnfv-apex-opendaylight-sfc package to be installed, since it
+  # uses a different overcloud image.
+  sfc: false
+
+  # Whether to configure ODL with SDNVPN support.
+  vpn: false
+
+  # Which dataplane to use for overcloud tenant networks. Valid options are
+  # '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
+
+  # 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:
+  #  Controller:
+  #    kernel:
+  #      # In this example, these three settings will be passed to the kernel boot line.
+  #      # Any key/value pair can be entered here, so care should be taken to ensure that machines
+  #      # do not fail to boot.
+  #      #
+  #      # isolcpus is generally used to push host processes off a particular core,
+  #      # so that it can be dedicated to a specific process. On control nodes
+  #      # this could be an ovs_dpdk process.
+  #      isolcpus: 1
+  #      # Hugepages are required for ovs_dpdk support.
+  #      hugepage: 2M
+  #      # intel_iommu is also required for ovs_dpdk support.
+  #      intel_iommu: 'on'
+  #  Compute:
+  #    nova:
+  #      # 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/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
+  #      # or ovs_dpdk
+  #      isolcpus: 0
+  #      hugepage: 2M
+  #      intel_iommu: 'on'
+
+  # Set yardstick option to install yardstick
+  #yardstick: false
+
+  # Set dovetail option to install dovetail
+  #dovetail: false