Fix vmtp/cfg.default.yaml
It fixes all errors/warnings detected by yamllint. It adds a new entry in tox.ini to verify all changes. Change-Id: I6aee76f9395f0f3d8b3e071e429a0d3d3ed03f18 Signed-off-by: Cédric Ollivier <ollivier.cedric@gmail.com>
This commit is contained in:
Cédric Ollivier
parent
fba0464d8a
commit
c54ab8f629
|
|
@ -16,3 +16,4 @@ testrepository # Apache-2.0/BSD
|
|||
testscenarios # Apache-2.0/BSD
|
||||
testtools # MIT
|
||||
pytest>=3.0.2
|
||||
yamllint
|
||||
|
|
|
|||
5
tox.ini
5
tox.ini
|
|
@ -1,6 +1,6 @@
|
|||
[tox]
|
||||
minversion = 1.6
|
||||
envlist = py27,pep8
|
||||
envlist = py27,pep8,yamllint
|
||||
skipsdist = True
|
||||
|
||||
[testenv]
|
||||
|
|
@ -27,6 +27,9 @@ commands = python setup.py testr --coverage --testr-args='{posargs}'
|
|||
[testenv:docs]
|
||||
commands = python setup.py build_sphinx
|
||||
|
||||
[testenv:yamllint]
|
||||
commands = yamllint -s vmtp/cfg.default.yaml
|
||||
|
||||
[flake8]
|
||||
# H803 skipped on purpose per list discussion.
|
||||
max-line-length = 100
|
||||
|
|
|
|||
|
|
@ -1,28 +1,30 @@
|
|||
#
|
||||
# VMTP default configuration file
|
||||
#
|
||||
# This configuration file is ALWAYS loaded by VMTP and should never be modified by users.
|
||||
# To specify your own property values, always define them in a separate config file
|
||||
# and pass that file to the script using -c or --config <file>
|
||||
# Property values in that config file will override the default values in the current file
|
||||
# This configuration file is ALWAYS loaded by VMTP and should never be modified
|
||||
# by users. To specify your own property values, always define them in a
|
||||
# separate config file and pass that file to the script using -c or --config
|
||||
# <file> .Property values in that config file will override the default values
|
||||
# in the current file
|
||||
#
|
||||
---
|
||||
|
||||
# Name of the image to use for launching the test VMs. This name must be
|
||||
# the exact same name used in OpenStack (as shown from 'nova image-list')
|
||||
# Any image running Linux should work (Fedora, Ubuntu, CentOS...)
|
||||
image_name: 'Ubuntu Server 14.04'
|
||||
#image_name: 'Fedora 21'
|
||||
image_name: 'Ubuntu Server 14.04'
|
||||
# image_name: 'Fedora 21'
|
||||
|
||||
# User name to use to ssh to the test VMs
|
||||
# This is specific to the image being used
|
||||
ssh_vm_username: 'ubuntu'
|
||||
#ssh_vm_username: fedora
|
||||
# ssh_vm_username: fedora
|
||||
|
||||
# Flavor name to use for all VMs created by VMTP.
|
||||
# If this flavor is unspecified, flavor name will be set to default name "vmtp".
|
||||
# If this flavor exists it will be re-used as-is by VMTP.
|
||||
# Otherwise, a flavor with attributes specified in flavor property will be created.
|
||||
# Otherwise, a flavor with attributes specified in flavor property will be
|
||||
# created.
|
||||
flavor_type: 'vmtp'
|
||||
|
||||
# Custom flavor attributes
|
||||
|
|
@ -48,13 +50,13 @@ flavor:
|
|||
# 1 compute node, only intra-node troughput will be measured.
|
||||
# If empty (default), VMTP will automatically pick the first 2 hosts
|
||||
# that are compute nodes regardless of the availability zone
|
||||
#availability_zone: 'nova'
|
||||
# availability_zone: 'nova'
|
||||
availability_zone:
|
||||
|
||||
# DNS server IP addresses to use for the VM (list of 1 or more DNS servers)
|
||||
# This default DNS server is available on the Internet,
|
||||
# Change this to use a different DNS server if necessary,
|
||||
dns_nameservers: [ '8.8.8.8' ]
|
||||
dns_nameservers: ['8.8.8.8']
|
||||
|
||||
# VMTP can automatically download a VM image if the image named by
|
||||
# image_name is missing, for that you need to specify a URL where
|
||||
|
|
@ -81,7 +83,7 @@ vm_image_url: ''
|
|||
reuse_network_name:
|
||||
|
||||
# Use of the script for special deployments
|
||||
floating_ip: True
|
||||
floating_ip: true
|
||||
|
||||
# Set this to an existing VM name if the script should not create new VM
|
||||
# and reuse existing VM
|
||||
|
|
@ -98,7 +100,8 @@ user_data_file:
|
|||
# ipv6 mode. Set this to one of the following 3 modes
|
||||
# slaac : VM obtains IPV6 address from Openstack radvd using SLAAC
|
||||
# dhcpv6-stateful : VM obtains ipv6 address from dnsmasq using DHCPv6 stateful
|
||||
# dhcpv6-stateless : VM obtains ipv6 address from Openstack radvd using SLAAC and options from dnsmasq
|
||||
# dhcpv6-stateless : VM obtains ipv6 address from Openstack radvd using SLAAC
|
||||
# and options from dnsmasq
|
||||
# If left blank use ipv4
|
||||
ipv6_mode:
|
||||
|
||||
|
|
@ -117,16 +120,16 @@ internal_network_name: ['pns-internal-net', 'pns-internal-net2']
|
|||
internal_subnet_name: ['pns-internal-subnet', 'pns-internal-subnet2']
|
||||
|
||||
# Name of the subnets for ipv6
|
||||
internal_subnet_name_v6: ['pns-internal-v6-subnet','pns-internal-v6-subnet2']
|
||||
internal_subnet_name_v6: ['pns-internal-v6-subnet', 'pns-internal-v6-subnet2']
|
||||
|
||||
# Default CIDRs to use for the internal mgmt subnet
|
||||
internal_cidr: ['192.168.1.0/24' , '192.168.2.0/24']
|
||||
internal_cidr: ['192.168.1.0/24', '192.168.2.0/24']
|
||||
|
||||
# Default CIDRs to use for data network for ipv6
|
||||
internal_cidr_v6: ['2001:45::/64','2001:46::/64']
|
||||
internal_cidr_v6: ['2001:45::/64', '2001:46::/64']
|
||||
|
||||
# The public and private keys to use to ssh to all targets (VMs, containers, hosts)
|
||||
# By default the SSH library will try several methods to authenticate:
|
||||
# The public and private keys to use to ssh to all targets (VMs, containers,
|
||||
# hosts). By default the SSH library will try several methods to authenticate:
|
||||
# - password if provided on the command line
|
||||
# - user's own key pair (under the home directory $HOME) if already setup
|
||||
# - the below key pair if not empty
|
||||
|
|
@ -139,10 +142,10 @@ private_key_file:
|
|||
public_key_name: 'pns_public_key'
|
||||
|
||||
# name of the server VM
|
||||
vm_name_server: 'TestServer'
|
||||
vm_name_server: 'TestServer'
|
||||
|
||||
# name of the client VM
|
||||
vm_name_client: 'TestClient'
|
||||
vm_name_client: 'TestClient'
|
||||
|
||||
# name of the security group to create and use
|
||||
security_group_name: 'pns-security'
|
||||
|
|
@ -186,7 +189,8 @@ icmp_pkt_sizes: [64, 391, 1500]
|
|||
udp_loss_rate_range: [2, 5]
|
||||
|
||||
# The default bandwidth limit (in Kbps) for TCP/UDP flow measurement
|
||||
# 0 means unlimited, which can be overridden at the command line using --bandwidth
|
||||
# 0 means unlimited, which can be overridden at the command line using
|
||||
# --bandwidth
|
||||
vm_bandwidth: 0
|
||||
|
||||
# Internal network name for OpenStack to hold data plane traffic
|
||||
|
|
@ -198,7 +202,7 @@ os_dataplane_network: 'physnet1'
|
|||
|
||||
########################################
|
||||
# Default MongoDB port is 27017, to override
|
||||
#vmtp_mongod_port: <port no>
|
||||
# vmtp_mongod_port: <port no>
|
||||
|
||||
########################################
|
||||
# MongoDB pns database.
|
||||
|
|
@ -211,17 +215,17 @@ vmtp_db: "client_db"
|
|||
########################################
|
||||
vmtp_collection: "pns_web_entry"
|
||||
|
||||
# When enabled, all logs will be sent to a fluentd server at the requested IP and port
|
||||
# The fluentd "tag" and "label" fields for every message will be set to "nfvbench"
|
||||
# When enabled, all logs will be sent to a fluentd server at the requested IP
|
||||
# and port. The fluentd "tag" and "label" fields for every message will be set
|
||||
# to "nfvbench"
|
||||
fluentd:
|
||||
# by default (logging_tag is empty) nfvbench log messages are not sent to fluentd
|
||||
# to enable logging to fluents, specify a valid fluentd tag name to be used for the
|
||||
# log records
|
||||
logging_tag:
|
||||
# by default (logging_tag is empty) nfvbench log messages are not sent to
|
||||
# fluentd. To enable logging to fluents, specify a valid fluentd tag name
|
||||
# to be used for the log records
|
||||
logging_tag:
|
||||
|
||||
# IP address of the server, defaults to loopback
|
||||
ip: 127.0.0.1
|
||||
|
||||
# port # to use, by default, use the default fluentd forward port
|
||||
port: 24224
|
||||
# IP address of the server, defaults to loopback
|
||||
ip: 127.0.0.1
|
||||
|
||||
# port # to use, by default, use the default fluentd forward port
|
||||
port: 24224
|
||||
|
|
|
|||
Loading…
Reference in New Issue