diff options
author | Tim Rozet <trozet@redhat.com> | 2017-05-17 15:58:59 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-05-17 15:58:59 +0000 |
commit | b411839804e6fca023ef7a695bbb616ea80fd6f3 (patch) | |
tree | 4ff5708b37e36dfef879b762e91b9b9fae8e772b /config/deploy | |
parent | 2f1a9dc491f55b5890a030a8ee36faa15de57b9e (diff) | |
parent | 95ee731525170e8dd4df813d5ca7e43b0ba2f4eb (diff) |
Merge "Adding yamllint to build checks"
Diffstat (limited to 'config/deploy')
28 files changed, 72 insertions, 42 deletions
diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml index 3186a5da..7406fe6f 100644 --- a/config/deploy/deploy_settings.yaml +++ b/config/deploy/deploy_settings.yaml @@ -1,3 +1,4 @@ +--- # 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 @@ -16,10 +17,10 @@ deploy_options: # 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 + # odl_version: carbon - # Whether to configure ODL L3 support. This will disable the Neutron L3 Agent and - # use ODL instead. + # 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) @@ -29,9 +30,9 @@ deploy_options: # Note: Congress is already installed by default congress: false - # 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. + # 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. @@ -39,7 +40,7 @@ deploy_options: # Which dataplane to use for overcloud tenant networks. Valid options are # 'ovs', 'ovs_dpdk' and 'fdio'. - dataplane : ovs + 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 @@ -50,48 +51,50 @@ deploy_options: vpp: false # Whether to run vsperf after the install has completed - #vsperf: false + # 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 + # 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/ocata/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 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 + # # /ocata/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 + # yardstick: false # Set dovetail option to install dovetail - #dovetail: false + # dovetail: false diff --git a/config/deploy/os-nosdn-fdio-ha.yaml b/config/deploy/os-nosdn-fdio-ha.yaml index 3f0f8a20..d8af12db 100644 --- a/config/deploy/os-nosdn-fdio-ha.yaml +++ b/config/deploy/os-nosdn-fdio-ha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: true diff --git a/config/deploy/os-nosdn-fdio-noha.yaml b/config/deploy/os-nosdn-fdio-noha.yaml index 5f27bed1..446ddfd1 100644 --- a/config/deploy/os-nosdn-fdio-noha.yaml +++ b/config/deploy/os-nosdn-fdio-noha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: false diff --git a/config/deploy/os-nosdn-kvm-ha.yaml b/config/deploy/os-nosdn-kvm-ha.yaml index cb68a313..b01a8352 100644 --- a/config/deploy/os-nosdn-kvm-ha.yaml +++ b/config/deploy/os-nosdn-kvm-ha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: true diff --git a/config/deploy/os-nosdn-kvm-noha.yaml b/config/deploy/os-nosdn-kvm-noha.yaml index bf737d71..a9c8d976 100644 --- a/config/deploy/os-nosdn-kvm-noha.yaml +++ b/config/deploy/os-nosdn-kvm-noha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: false diff --git a/config/deploy/os-nosdn-nofeature-ha.yaml b/config/deploy/os-nosdn-nofeature-ha.yaml index 286b5162..3c26b832 100644 --- a/config/deploy/os-nosdn-nofeature-ha.yaml +++ b/config/deploy/os-nosdn-nofeature-ha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: true diff --git a/config/deploy/os-nosdn-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml index 2d1b44ad..2cd6633c 100644 --- a/config/deploy/os-nosdn-nofeature-noha.yaml +++ b/config/deploy/os-nosdn-nofeature-noha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: false diff --git a/config/deploy/os-nosdn-ovs_dpdk-ha.yaml b/config/deploy/os-nosdn-ovs_dpdk-ha.yaml index c9d58671..8e312216 100644 --- a/config/deploy/os-nosdn-ovs_dpdk-ha.yaml +++ b/config/deploy/os-nosdn-ovs_dpdk-ha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: true diff --git a/config/deploy/os-nosdn-ovs_dpdk-noha.yaml b/config/deploy/os-nosdn-ovs_dpdk-noha.yaml index cf9b854d..f28b0c49 100644 --- a/config/deploy/os-nosdn-ovs_dpdk-noha.yaml +++ b/config/deploy/os-nosdn-ovs_dpdk-noha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: false diff --git a/config/deploy/os-nosdn-performance-ha.yaml b/config/deploy/os-nosdn-performance-ha.yaml index acbc1d34..f5d0656f 100644 --- a/config/deploy/os-nosdn-performance-ha.yaml +++ b/config/deploy/os-nosdn-performance-ha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: true diff --git a/config/deploy/os-ocl-nofeature-ha.yaml b/config/deploy/os-ocl-nofeature-ha.yaml index 4ad1ee2b..bc05fa47 100644 --- a/config/deploy/os-ocl-nofeature-ha.yaml +++ b/config/deploy/os-ocl-nofeature-ha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: true diff --git a/config/deploy/os-odl-bgpvpn-ha.yaml b/config/deploy/os-odl-bgpvpn-ha.yaml index 76d051eb..b55c4591 100644 --- a/config/deploy/os-odl-bgpvpn-ha.yaml +++ b/config/deploy/os-odl-bgpvpn-ha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: true diff --git a/config/deploy/os-odl-bgpvpn-noha.yaml b/config/deploy/os-odl-bgpvpn-noha.yaml index d569ba6c..babb9314 100644 --- a/config/deploy/os-odl-bgpvpn-noha.yaml +++ b/config/deploy/os-odl-bgpvpn-noha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: false diff --git a/config/deploy/os-odl-csit-noha.yaml b/config/deploy/os-odl-csit-noha.yaml index d5e2695e..67bdec1c 100644 --- a/config/deploy/os-odl-csit-noha.yaml +++ b/config/deploy/os-odl-csit-noha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: false diff --git a/config/deploy/os-odl-fdio-ha.yaml b/config/deploy/os-odl-fdio-ha.yaml index af81e5a5..cb7643d1 100644 --- a/config/deploy/os-odl-fdio-ha.yaml +++ b/config/deploy/os-odl-fdio-ha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: true diff --git a/config/deploy/os-odl-fdio-noha.yaml b/config/deploy/os-odl-fdio-noha.yaml index adb37f3d..12c1fa6d 100644 --- a/config/deploy/os-odl-fdio-noha.yaml +++ b/config/deploy/os-odl-fdio-noha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: false diff --git a/config/deploy/os-odl-gluon-noha.yaml b/config/deploy/os-odl-gluon-noha.yaml index 12e5d25f..03ca1034 100644 --- a/config/deploy/os-odl-gluon-noha.yaml +++ b/config/deploy/os-odl-gluon-noha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: false @@ -9,4 +10,4 @@ deploy_options: congress: true sfc: false vpn: true - gluon: true
\ No newline at end of file + gluon: true diff --git a/config/deploy/os-odl-nofeature-ha.yaml b/config/deploy/os-odl-nofeature-ha.yaml index 64af606a..c4bce1c7 100644 --- a/config/deploy/os-odl-nofeature-ha.yaml +++ b/config/deploy/os-odl-nofeature-ha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: true diff --git a/config/deploy/os-odl-nofeature-noha.yaml b/config/deploy/os-odl-nofeature-noha.yaml index d95ed9c6..0c9b4fb5 100644 --- a/config/deploy/os-odl-nofeature-noha.yaml +++ b/config/deploy/os-odl-nofeature-noha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: false diff --git a/config/deploy/os-odl-ovs_dpdk-ha.yaml b/config/deploy/os-odl-ovs_dpdk-ha.yaml index 8e3674a0..8bf38e27 100644 --- a/config/deploy/os-odl-ovs_dpdk-ha.yaml +++ b/config/deploy/os-odl-ovs_dpdk-ha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: true diff --git a/config/deploy/os-odl-ovs_dpdk-noha.yaml b/config/deploy/os-odl-ovs_dpdk-noha.yaml index 1711fc63..6d6be985 100644 --- a/config/deploy/os-odl-ovs_dpdk-noha.yaml +++ b/config/deploy/os-odl-ovs_dpdk-noha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: false diff --git a/config/deploy/os-odl_l2-fdio-ha.yaml b/config/deploy/os-odl_l2-fdio-ha.yaml index d4a86b0f..68777db0 100644 --- a/config/deploy/os-odl_l2-fdio-ha.yaml +++ b/config/deploy/os-odl_l2-fdio-ha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: true diff --git a/config/deploy/os-odl_l2-fdio-noha.yaml b/config/deploy/os-odl_l2-fdio-noha.yaml index b9e0cea6..ab23e975 100644 --- a/config/deploy/os-odl_l2-fdio-noha.yaml +++ b/config/deploy/os-odl_l2-fdio-noha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: false diff --git a/config/deploy/os-odl_l2-sfc-noha.yaml b/config/deploy/os-odl_l2-sfc-noha.yaml index 4423b175..8104e7ea 100644 --- a/config/deploy/os-odl_l2-sfc-noha.yaml +++ b/config/deploy/os-odl_l2-sfc-noha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: false diff --git a/config/deploy/os-odl_netvirt-fdio-noha.yaml b/config/deploy/os-odl_netvirt-fdio-noha.yaml index fa6ba800..6cf8c1a6 100644 --- a/config/deploy/os-odl_netvirt-fdio-noha.yaml +++ b/config/deploy/os-odl_netvirt-fdio-noha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: false diff --git a/config/deploy/os-onos-nofeature-ha.yaml b/config/deploy/os-onos-nofeature-ha.yaml index 0d083dda..542f6df7 100644 --- a/config/deploy/os-onos-nofeature-ha.yaml +++ b/config/deploy/os-onos-nofeature-ha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: true diff --git a/config/deploy/os-onos-sfc-ha.yaml b/config/deploy/os-onos-sfc-ha.yaml index f0b78511..2d68573c 100644 --- a/config/deploy/os-onos-sfc-ha.yaml +++ b/config/deploy/os-onos-sfc-ha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: true diff --git a/config/deploy/os-ovn-nofeature-noha.yaml b/config/deploy/os-ovn-nofeature-noha.yaml index e03ac0ab..d2702c9c 100644 --- a/config/deploy/os-ovn-nofeature-noha.yaml +++ b/config/deploy/os-ovn-nofeature-noha.yaml @@ -1,3 +1,4 @@ +--- global_params: ha_enabled: false |