summaryrefslogtreecommitdiffstats
path: root/pharos-validator/src/validation_tool
diff options
context:
space:
mode:
authorTrevor Bramwell <tbramwell@linuxfoundation.org>2017-06-23 16:13:12 -0700
committerTrevor Bramwell <tbramwell@linuxfoundation.org>2017-06-27 15:33:21 -0700
commit43803375b8f30150026362fec4135f4eb8b75bd6 (patch)
tree270216bf490f75782de55c6399972bf20ec2adda /pharos-validator/src/validation_tool
parent2235d14f060327066ea035288ca97994c41fc65a (diff)
Fix Yamllint Violations
JIRA: PHAROS-298 Change-Id: I1c9afc9bfee4a60144b95bc38e2333260c95167a Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
Diffstat (limited to 'pharos-validator/src/validation_tool')
-rw-r--r--pharos-validator/src/validation_tool/doc/config.yaml5
-rw-r--r--pharos-validator/src/validation_tool/doc/example/config.yaml5
-rw-r--r--pharos-validator/src/validation_tool/doc/example/inventory.yaml57
-rw-r--r--pharos-validator/src/validation_tool/doc/example/network.yaml66
-rw-r--r--pharos-validator/src/validation_tool/doc/inventory.yaml57
-rw-r--r--pharos-validator/src/validation_tool/doc/network.yaml66
6 files changed, 128 insertions, 128 deletions
diff --git a/pharos-validator/src/validation_tool/doc/config.yaml b/pharos-validator/src/validation_tool/doc/config.yaml
index 6b3a6d0..f2146ff 100644
--- a/pharos-validator/src/validation_tool/doc/config.yaml
+++ b/pharos-validator/src/validation_tool/doc/config.yaml
@@ -1,9 +1,10 @@
+---
###################
# Program arguments
###################
#
# Define path of output file
-output: "yaml" # Values are ("yaml", )
+output: "yaml" # Values are ("yaml", )
#################
# Server settings
@@ -33,6 +34,4 @@ logfile: "/tmp/runtime_logs.txt"
# Path to test logs
test_log: "/tmp/results.yaml"
# Path to dhcpd configuration file
-#dhcpdfile: "/etc/dhcp/dhcpd.conf"
dhcpdfile: "/etc/dhcp/dhcpd.conf"
-
diff --git a/pharos-validator/src/validation_tool/doc/example/config.yaml b/pharos-validator/src/validation_tool/doc/example/config.yaml
index 6b3a6d0..f2146ff 100644
--- a/pharos-validator/src/validation_tool/doc/example/config.yaml
+++ b/pharos-validator/src/validation_tool/doc/example/config.yaml
@@ -1,9 +1,10 @@
+---
###################
# Program arguments
###################
#
# Define path of output file
-output: "yaml" # Values are ("yaml", )
+output: "yaml" # Values are ("yaml", )
#################
# Server settings
@@ -33,6 +34,4 @@ logfile: "/tmp/runtime_logs.txt"
# Path to test logs
test_log: "/tmp/results.yaml"
# Path to dhcpd configuration file
-#dhcpdfile: "/etc/dhcp/dhcpd.conf"
dhcpdfile: "/etc/dhcp/dhcpd.conf"
-
diff --git a/pharos-validator/src/validation_tool/doc/example/inventory.yaml b/pharos-validator/src/validation_tool/doc/example/inventory.yaml
index d0f5083..2ba768a 100644
--- a/pharos-validator/src/validation_tool/doc/example/inventory.yaml
+++ b/pharos-validator/src/validation_tool/doc/example/inventory.yaml
@@ -1,37 +1,38 @@
+---
nodes:
- - name: node0
- tags: control #optional param, other valid value "compute"
+ - name: node0
+ tags: control # optional param, other valid value "compute"
arch: "x86_64"
- mac_address: "de:ad:be:ef:11:11" #pxe boot interface mac
- cpus: 2 #required only for virtual deployments
- memory: 2048 #required only for virtual deployments
- disk: 40 #required only for virtual deployments
+ mac_address: "de:ad:be:ef:11:11" # pxe boot interface mac
+ cpus: 2 # required only for virtual deployments
+ memory: 2048 # required only for virtual deployments
+ disk: 40 # required only for virtual deployments
power:
- type: ipmi
- address: 10.4.7.2
- user: root
- pass: root
+ type: ipmi
+ address: 10.4.7.2
+ user: root
+ pass: root
- name: node1
- tags: control #optional param, other valid value "compute"
+ tags: control # optional param, other valid value "compute"
arch: "x86_64"
- mac_address: "de:ad:be:ef:22:22" #pxe boot interface mac
- cpus: 2 #required only for virtual deployments
- memory: 2048 #required only for virtual deployments
- disk: 40 #required only for virtual deployments
+ mac_address: "de:ad:be:ef:22:22" # pxe boot interface mac
+ cpus: 2 # required only for virtual deployments
+ memory: 2048 # required only for virtual deployments
+ disk: 40 # required only for virtual deployments
power:
- type: ipmi
- address: 10.4.7.3
- user: root
- pass: root
+ type: ipmi
+ address: 10.4.7.3
+ user: root
+ pass: root
- name: node2
- tags: control #optional param, other valid value "compute"
+ tags: control # optional param, other valid value "compute"
arch: "x86_64"
- mac_address: "de:ad:be:ef:33:33" #pxe boot interface mac
- cpus: 2 #required only for virtual deployments
- memory: 2048 #required only for virtual deployments
- disk: 40 #required only for virtual deployments
+ mac_address: "de:ad:be:ef:33:33" # pxe boot interface mac
+ cpus: 2 # required only for virtual deployments
+ memory: 2048 # required only for virtual deployments
+ disk: 40 # required only for virtual deployments
power:
- type: ipmi
- address: 10.4.7.4
- user: root
- pass: root
+ type: ipmi
+ address: 10.4.7.4
+ user: root
+ pass: root
diff --git a/pharos-validator/src/validation_tool/doc/example/network.yaml b/pharos-validator/src/validation_tool/doc/example/network.yaml
index 34329cc..91c1be9 100644
--- a/pharos-validator/src/validation_tool/doc/example/network.yaml
+++ b/pharos-validator/src/validation_tool/doc/example/network.yaml
@@ -1,3 +1,4 @@
+---
# This configuration file defines Network Environment for a
# Baremetal Deployment of OPNFV. It contains default values
# for 5 following networks:
@@ -30,16 +31,14 @@
#
# "api" is an optional network for splitting out OpenStack service API
# communication. This should be used for IPv6 deployments.
-
-network-config-metadata: #Meta data for the network configuration
+
+network-config-metadata: # Meta data for the network configuration
title: LF-POD-1 Network config #
version: 0.1 #
created: Mon Dec 28 2015 #
comment: None #
- #
-
- #
- #
+
+# yamllint disable rule:line-length
networks: # Network configurations
admin: # Admin configuration (pxe and jumpstart),
enabled: true
@@ -48,11 +47,11 @@ networks: # Network configurations
nic_type: interface # Indicates if this VM will be bridged to an interface, or to a bond
members:
- em1 # Member Interface to bridge to for installer VM (use multiple values for bond)
- vlan: 29 # VLAN tag to use for this network on Installer VM, native means none
- ip: 10.10.25.100 # IP to assign to Installer VM on this network
+ vlan: 29 # VLAN tag to use for this network on Installer VM, native means none
+ ip: 10.10.25.100 # IP to assign to Installer VM on this network
usable_ip_range: 10.10.25.0,10.10.25.100 # Usable ip range, if empty entire range is usable, ex. 192.168.1.10,192.168.1.20
- gateway: 192.0.2.1 # Gateway (only needed when public_network is disabled)
- cidr: 10.10.25.0/24 # Subnet in CIDR format 192.168.1.0/24
+ gateway: 192.0.2.1 # Gateway (only needed when public_network is disabled)
+ cidr: 10.10.25.0/24 # Subnet in CIDR format 192.168.1.0/24
dhcp_range: 10.10.25.50,10.10.25.99 # DHCP range for the admin network, if empty it will be automatically provisioned
dns-domain: opnfvlf.org # Admin network dns domain
dns-search: opnfvlf.org # Admin network dns-search domain
@@ -74,16 +73,16 @@ networks: # Network configurations
members:
- eth1
- eth2
- #
+
tenant: # Tenant network configuration
enabled: true
cidr: 11.0.0.0/24 # Subnet in CIDR format 192.168.1.0/24
vlan: 10 # VLAN tag to use for Overcloud hosts on this network
mtu: 64000 # Tenant network MTU
- overlay_id_range: 2,65535 # Tenant network Overlay segmentation ID range:
- # VNI, VLAN-ID, etc.
- segmentation_type: vxlan # Tenant network segmentation type:
- # vlan, vxlan, gre
+ overlay_id_range: 2,65535 # Tenant network Overlay segmentation ID range: VNI, VLAN-ID, etc.
+
+ segmentation_type: vxlan # Tenant network segmentation type:vlan, vxlan, gre
+
nic_mapping: # Mapping of network configuration for Overcloud Nodes
compute: # Mapping for compute profile (nodes that will be used as Compute nodes)
phys_type: interface # Physical interface type (interface or bond)
@@ -95,7 +94,7 @@ networks: # Network configurations
vlan: 10
members:
- eth1 # Note, for Apex you may also use the logical nic name (found by nic order), such as "nic1"
- #
+
external: # Can contain 1 or more external networks
- public: # "public" network will be the network the installer VM attaches to
enabled: true
@@ -108,11 +107,11 @@ networks: # Network configurations
ip: 192.168.37.12 # IP to assign to Installer VM on this network
cidr: 192.168.37.0/24
gateway: 192.168.37.1
- floating_ip_range: 192.168.37.200,192.168.37.220 #Range to allocate to floating IPs for the public network with Neutron
- usable_ip_range: 192.168.37.10,192.168.37.199 #Usable IP range on the public network, usually this is a shared subnet
+ floating_ip_range: 192.168.37.200,192.168.37.220 # Range to allocate to floating IPs for the public network with Neutron
+ usable_ip_range: 192.168.37.10,192.168.37.199 # Usable IP range on the public network, usually this is a shared subnet
dns_nameservers: # External dns servers
- - 8.8.8.8 #
- - 8.8.4.4 #
+ - 8.8.8.8 #
+ - 8.8.4.4 #
ntp: # External upstream NTP servers
- 0.se.pool.ntp.org #
- 1.se.pool.ntp.org #
@@ -131,20 +130,20 @@ networks: # Network configurations
members:
- eth1
external_overlay: # External network to be created in OpenStack by Services tenant
- name: Public_internet
- type: flat
- gateway: 192.168.37.1
+ name: Public_internet
+ type: flat
+ gateway: 192.168.37.1
- private_cloud: # another external network
enabled: false
vlan: 101
mtu: 64000
cidr: 192.168.38.0/24
gateway: 192.168.38.1
- floating_ip_range: 192.168.38.200,192.168.38.220 #Range to allocate to floating IPs for the public network with Neutron
- usable_ip_range: 192.168.38.10,192.168.38.199 #Usable IP range on the public network, usually this is a shared subnet
+ floating_ip_range: 192.168.38.200,192.168.38.220 # Range to allocate to floating IPs for the public network with Neutron
+ usable_ip_range: 192.168.38.10,192.168.38.199 # Usable IP range on the public network, usually this is a shared subnet
dns_nameservers: # External dns servers
- - 8.8.8.8 #
- - 8.8.4.4 #
+ - 8.8.8.8 #
+ - 8.8.4.4 #
ntp: # External upstream NTP servers
- 0.se.pool.ntp.org #
- 1.se.pool.ntp.org #
@@ -163,11 +162,11 @@ networks: # Network configurations
members:
- eth1
external_overlay: # External network to be created in OpenStack by Services tenant
- name: private_cloud
- type: vlan
- segmentation_id: 101
- gateway: 192.168.38.1
- #
+ name: private_cloud
+ type: vlan
+ segmentation_id: 101
+ gateway: 192.168.38.1
+
storage: # Storage network configuration
enabled: true
cidr: 12.0.0.0/24 # Subnet in CIDR format
@@ -186,7 +185,7 @@ networks: # Network configurations
members:
- eth3
- eth4
- #
+
api: # API network configuration
enabled: false
cidr: fd00:fd00:fd00:4000::/64 # Subnet in CIDR format
@@ -205,3 +204,4 @@ networks: # Network configurations
members:
- eth3
- eth4
+# yamllint enable rule:line-length
diff --git a/pharos-validator/src/validation_tool/doc/inventory.yaml b/pharos-validator/src/validation_tool/doc/inventory.yaml
index d0f5083..2ba768a 100644
--- a/pharos-validator/src/validation_tool/doc/inventory.yaml
+++ b/pharos-validator/src/validation_tool/doc/inventory.yaml
@@ -1,37 +1,38 @@
+---
nodes:
- - name: node0
- tags: control #optional param, other valid value "compute"
+ - name: node0
+ tags: control # optional param, other valid value "compute"
arch: "x86_64"
- mac_address: "de:ad:be:ef:11:11" #pxe boot interface mac
- cpus: 2 #required only for virtual deployments
- memory: 2048 #required only for virtual deployments
- disk: 40 #required only for virtual deployments
+ mac_address: "de:ad:be:ef:11:11" # pxe boot interface mac
+ cpus: 2 # required only for virtual deployments
+ memory: 2048 # required only for virtual deployments
+ disk: 40 # required only for virtual deployments
power:
- type: ipmi
- address: 10.4.7.2
- user: root
- pass: root
+ type: ipmi
+ address: 10.4.7.2
+ user: root
+ pass: root
- name: node1
- tags: control #optional param, other valid value "compute"
+ tags: control # optional param, other valid value "compute"
arch: "x86_64"
- mac_address: "de:ad:be:ef:22:22" #pxe boot interface mac
- cpus: 2 #required only for virtual deployments
- memory: 2048 #required only for virtual deployments
- disk: 40 #required only for virtual deployments
+ mac_address: "de:ad:be:ef:22:22" # pxe boot interface mac
+ cpus: 2 # required only for virtual deployments
+ memory: 2048 # required only for virtual deployments
+ disk: 40 # required only for virtual deployments
power:
- type: ipmi
- address: 10.4.7.3
- user: root
- pass: root
+ type: ipmi
+ address: 10.4.7.3
+ user: root
+ pass: root
- name: node2
- tags: control #optional param, other valid value "compute"
+ tags: control # optional param, other valid value "compute"
arch: "x86_64"
- mac_address: "de:ad:be:ef:33:33" #pxe boot interface mac
- cpus: 2 #required only for virtual deployments
- memory: 2048 #required only for virtual deployments
- disk: 40 #required only for virtual deployments
+ mac_address: "de:ad:be:ef:33:33" # pxe boot interface mac
+ cpus: 2 # required only for virtual deployments
+ memory: 2048 # required only for virtual deployments
+ disk: 40 # required only for virtual deployments
power:
- type: ipmi
- address: 10.4.7.4
- user: root
- pass: root
+ type: ipmi
+ address: 10.4.7.4
+ user: root
+ pass: root
diff --git a/pharos-validator/src/validation_tool/doc/network.yaml b/pharos-validator/src/validation_tool/doc/network.yaml
index 33d9560..705e848 100644
--- a/pharos-validator/src/validation_tool/doc/network.yaml
+++ b/pharos-validator/src/validation_tool/doc/network.yaml
@@ -1,3 +1,4 @@
+---
# This configuration file defines Network Environment for a
# Baremetal Deployment of OPNFV. It contains default values
# for 5 following networks:
@@ -30,16 +31,15 @@
#
# "api" is an optional network for splitting out OpenStack service API
# communication. This should be used for IPv6 deployments.
-
-network-config-metadata: #Meta data for the network configuration
+
+# yamllint disable rule:line-length
+network-config-metadata: # Meta data for the network configuration
title: LF-POD-1 Network config #
version: 0.1 #
created: Mon Dec 28 2015 #
comment: None #
- #
-
- #
- #
+
+
networks: # Network configurations
admin: # Admin configuration (pxe and jumpstart),
enabled: true
@@ -74,16 +74,16 @@ networks: # Network configurations
members:
- eth1
- eth2
- #
+
tenant: # Tenant network configuration
enabled: true
cidr: 11.0.0.0/24 # Subnet in CIDR format 192.168.1.0/24
vlan: 10 # VLAN tag to use for Overcloud hosts on this network
mtu: 64000 # Tenant network MTU
- overlay_id_range: 2,65535 # Tenant network Overlay segmentation ID range:
- # VNI, VLAN-ID, etc.
- segmentation_type: vxlan # Tenant network segmentation type:
- # vlan, vxlan, gre
+ overlay_id_range: 2,65535 # Tenant network Overlay segmentation ID range: VNI, VLAN-ID, etc.
+
+ segmentation_type: vxlan # Tenant network segmentation type: vlan, vxlan, gre
+
nic_mapping: # Mapping of network configuration for Overcloud Nodes
compute: # Mapping for compute profile (nodes that will be used as Compute nodes)
phys_type: interface # Physical interface type (interface or bond)
@@ -95,7 +95,7 @@ networks: # Network configurations
vlan: 10
members:
- eth1 # Note, for Apex you may also use the logical nic name (found by nic order), such as "nic1"
- #
+
external: # Can contain 1 or more external networks
- public: # "public" network will be the network the installer VM attaches to
enabled: true
@@ -108,11 +108,11 @@ networks: # Network configurations
ip: 192.168.37.12 # IP to assign to Installer VM on this network
cidr: 192.168.37.0/24
gateway: 192.168.37.1
- floating_ip_range: 192.168.37.200,192.168.37.220 #Range to allocate to floating IPs for the public network with Neutron
- usable_ip_range: 192.168.37.10,192.168.37.199 #Usable IP range on the public network, usually this is a shared subnet
+ floating_ip_range: 192.168.37.200,192.168.37.220 # Range to allocate to floating IPs for the public network with Neutron
+ usable_ip_range: 192.168.37.10,192.168.37.199 # Usable IP range on the public network, usually this is a shared subnet
dns_nameservers: # External dns servers
- - 8.8.8.8 #
- - 8.8.4.4 #
+ - 8.8.8.8 #
+ - 8.8.4.4 #
ntp: # External upstream NTP servers
- 0.se.pool.ntp.org #
- 1.se.pool.ntp.org #
@@ -131,20 +131,20 @@ networks: # Network configurations
members:
- eth1
external_overlay: # External network to be created in OpenStack by Services tenant
- name: Public_internet
- type: flat
- gateway: 192.168.37.1
+ name: Public_internet
+ type: flat
+ gateway: 192.168.37.1
- private_cloud: # another external network
enabled: false
vlan: 101
mtu: 64000
cidr: 192.168.38.0/24
gateway: 192.168.38.1
- floating_ip_range: 192.168.38.200,192.168.38.220 #Range to allocate to floating IPs for the public network with Neutron
- usable_ip_range: 192.168.38.10,192.168.38.199 #Usable IP range on the public network, usually this is a shared subnet
+ floating_ip_range: 192.168.38.200,192.168.38.220 # Range to allocate to floating IPs for the public network with Neutron
+ usable_ip_range: 192.168.38.10,192.168.38.199 # Usable IP range on the public network, usually this is a shared subnet
dns_nameservers: # External dns servers
- - 8.8.8.8 #
- - 8.8.4.4 #
+ - 8.8.8.8 #
+ - 8.8.4.4 #
ntp: # External upstream NTP servers
- 0.se.pool.ntp.org #
- 1.se.pool.ntp.org #
@@ -163,11 +163,11 @@ networks: # Network configurations
members:
- eth1
external_overlay: # External network to be created in OpenStack by Services tenant
- name: private_cloud
- type: vlan
- segmentation_id: 101
- gateway: 192.168.38.1
- #
+ name: private_cloud
+ type: vlan
+ segmentation_id: 101
+ gateway: 192.168.38.1
+
storage: # Storage network configuration
enabled: true
cidr: 12.0.0.0/24 # Subnet in CIDR format
@@ -186,7 +186,7 @@ networks: # Network configurations
members:
- eth3
- eth4
- #
+
api: # API network configuration
enabled: false
cidr: fd00:fd00:fd00:4000::/64 # Subnet in CIDR format
@@ -205,17 +205,17 @@ networks: # Network configurations
members:
- eth3
- eth4
-
+
# JOID specific settings
joid:
-
+
# Compass specific settings
compass:
-
+
# Apex specific settings
apex:
networks:
admin:
- introspection_range: 192.0.2.100,192.0.2.120 #Range used for introspection phase (examining nodes)
+ introspection_range: 192.0.2.100,192.0.2.120 # Range used for introspection phase (examining nodes)
# Fuel specific settings
fuel: