summaryrefslogtreecommitdiffstats
path: root/config/deploy
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2017-04-19 12:08:41 -0400
committerDan Radez <dradez@redhat.com>2017-05-10 09:26:31 -0400
commit95ee731525170e8dd4df813d5ca7e43b0ba2f4eb (patch)
treeb059ff902ed333e12048449c5103d0cc9f0a57ea /config/deploy
parentac3a86983e4c049a3115c7bd77eeacaeb19d0ca3 (diff)
Adding yamllint to build checks
- making formatting changes to yaml files to meet yamllint checks Change-Id: Id48a8446512943e908e61dc00bbe6c033af27775 Signed-off-by: Dan Radez <dradez@redhat.com>
Diffstat (limited to 'config/deploy')
-rw-r--r--config/deploy/deploy_settings.yaml85
-rw-r--r--config/deploy/os-nosdn-fdio-ha.yaml1
-rw-r--r--config/deploy/os-nosdn-fdio-noha.yaml1
-rw-r--r--config/deploy/os-nosdn-kvm-ha.yaml1
-rw-r--r--config/deploy/os-nosdn-kvm-noha.yaml1
-rw-r--r--config/deploy/os-nosdn-nofeature-ha.yaml1
-rw-r--r--config/deploy/os-nosdn-nofeature-noha.yaml1
-rw-r--r--config/deploy/os-nosdn-ovs_dpdk-ha.yaml1
-rw-r--r--config/deploy/os-nosdn-ovs_dpdk-noha.yaml1
-rw-r--r--config/deploy/os-nosdn-performance-ha.yaml1
-rw-r--r--config/deploy/os-ocl-nofeature-ha.yaml1
-rw-r--r--config/deploy/os-odl-bgpvpn-ha.yaml1
-rw-r--r--config/deploy/os-odl-bgpvpn-noha.yaml1
-rw-r--r--config/deploy/os-odl-csit-noha.yaml1
-rw-r--r--config/deploy/os-odl-fdio-ha.yaml1
-rw-r--r--config/deploy/os-odl-fdio-noha.yaml1
-rw-r--r--config/deploy/os-odl-gluon-noha.yaml3
-rw-r--r--config/deploy/os-odl-nofeature-ha.yaml1
-rw-r--r--config/deploy/os-odl-nofeature-noha.yaml1
-rw-r--r--config/deploy/os-odl-ovs_dpdk-ha.yaml1
-rw-r--r--config/deploy/os-odl-ovs_dpdk-noha.yaml1
-rw-r--r--config/deploy/os-odl_l2-fdio-ha.yaml1
-rw-r--r--config/deploy/os-odl_l2-fdio-noha.yaml1
-rw-r--r--config/deploy/os-odl_l2-sfc-noha.yaml1
-rw-r--r--config/deploy/os-odl_netvirt-fdio-noha.yaml1
-rw-r--r--config/deploy/os-onos-nofeature-ha.yaml1
-rw-r--r--config/deploy/os-onos-sfc-ha.yaml1
-rw-r--r--config/deploy/os-ovn-nofeature-noha.yaml1
28 files changed, 72 insertions, 42 deletions
diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml
index 3186a5d..7406fe6 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 3f0f8a2..d8af12d 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 5f27bed..446ddfd 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 cb68a31..b01a835 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 bf737d7..a9c8d97 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 286b516..3c26b83 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 2d1b44a..2cd6633 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 c9d5867..8e31221 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 cf9b854..f28b0c4 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 acbc1d3..f5d0656 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 4ad1ee2..bc05fa4 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 76d051e..b55c459 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 d569ba6..babb931 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 d5e2695..67bdec1 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 af81e5a..cb7643d 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 adb37f3..12c1fa6 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 12e5d25..03ca103 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 64af606..c4bce1c 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 d95ed9c..0c9b4fb 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 8e3674a..8bf38e2 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 1711fc6..6d6be98 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 d4a86b0..68777db 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 b9e0cea..ab23e97 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 4423b17..8104e7e 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 fa6ba80..6cf8c1a 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 0d083dd..542f6df 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 f0b7851..2d68573 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 e03ac0a..d2702c9 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