Fix Yamllint Violations 31/36431/2
authorTrevor Bramwell <tbramwell@linuxfoundation.org>
Fri, 23 Jun 2017 23:13:12 +0000 (16:13 -0700)
committerTrevor Bramwell <tbramwell@linuxfoundation.org>
Tue, 27 Jun 2017 22:33:21 +0000 (15:33 -0700)
JIRA: PHAROS-298

Change-Id: I1c9afc9bfee4a60144b95bc38e2333260c95167a
Signed-off-by: Trevor Bramwell <tbramwell@linuxfoundation.org>
12 files changed:
config/pod1.yaml
docs/labs/ool/pod1_inventory.yaml
docs/labs/zte-sh-lab/pod-1.yaml
docs/labs/zte-sh-lab/pod-2.yaml
docs/labs/zte-sh-lab/pod-3.yaml
tools/pharos-dashboard/docker-compose.yml
tools/pharos-validator/src/validation_tool/doc/config.yaml
tools/pharos-validator/src/validation_tool/doc/example/config.yaml
tools/pharos-validator/src/validation_tool/doc/example/inventory.yaml
tools/pharos-validator/src/validation_tool/doc/example/network.yaml
tools/pharos-validator/src/validation_tool/doc/inventory.yaml
tools/pharos-validator/src/validation_tool/doc/network.yaml

index c031431..af5ada4 100644 (file)
@@ -1,3 +1,4 @@
+---
 ### POD descriptor file ###
 
 details:
@@ -11,28 +12,40 @@ details:
 jumphost:
   name: pod1-jump
   node:
-    type: {baremetal|virtual}               # can be virtual or baremetal
+    # type can be virtual or baremetal
+    type: {baremetal|virtual}
     vendor: supermicro
     model: S2600JF
     arch: {x86_64|aarch64}
     cpus: 2
-    cpu_cflags: {broadwell|hasewell|etc}    # add values based on CFLAGS in GCC
-    cores: 10                               # physical cores, not including hyper-threads
+    # add values based on CFLAGS in GCC
+    cpu_cflags: {broadwell|hasewell|etc}
+    # physical cores, not including hyper-threads
+    cores: 10
     memory: 32G
-  disks:                                    # disk list
-    - name: {disk#number}                   # first disk
-      disk_capacity: {M|MB|G|GB|T|TB}       # volume
-      disk_type: {hdd|ssd|cdrom|tape}       # several disk types possible
-      disk_interface: {sata|sas|ssd|nvme}   # several interface types possible
-      disk_rotation: {5400|7200|10000|15000} # define rotation speed of disk
-    - name: 'disk2'                         # second disk
+  # disk list
+  disks:
+    # first disk
+    - name: {disk#number}
+      # volume
+      disk_capacity: {M|MB|G|GB|T|TB}
+      # several disk types possible
+      disk_type: {hdd|ssd|cdrom|tape}
+      # several interface types possible
+      disk_interface: {sata|sas|ssd|nvme}
+      # define rotation speed of disk
+      disk_rotation: {5400|7200|10000|15000}
+    # second disk
+    - name: 'disk2'
       disk_capacity: 2048G
       disk_type: hdd
       disk_interface: sas
       disk_rotation: 15000
-  os: ubuntu-14.04                          #operation system installed
+  # operation system installed
+  os: ubuntu-14.04
   remote_para: &remoteparas
-    type: {ipmi|amt}                        # hardware manggement tool
+    # hardware manggement tool
+    type: {ipmi|amt}
     versions:
       - 1.0
       - 2.0
@@ -42,17 +55,23 @@ jumphost:
     <<: *remoteparas
     address: 10.4.7.3/24
     mac_address: "10:23:45:67:89:AC"
-  interfaces:                               # physical interface list
-    - nic: {nic#number}                     # first interface
-      address: 192.168.100.1                # ip address of nic
+  # physical interface list
+  interfaces:
+    # first interface
+    - nic: {nic#number}
+      # ip address of nic
+      address: 192.168.100.1
       mac_address: "10:23:45:67:89:AC"
-      vlan: {native|1-4095}                 # vlan tag, may have multiple tags
-    - nic: 'nic2'                           # second interface
+      # vlan tag, may have multiple tags
+      vlan: {native|1-4095}
+    # second interface
+    - nic: 'nic2'
       address: 10.20.0.1/24
       mac_address: "10:23:45:67:89:5B"
 nodes:
   - name: pod1-node1
-    node: &nodeparas                        # for nodes in the same pod may have the same configuration
+    # for nodes in the same pod may have the same configuration
+    node: &nodeparas
       type: baremetal
       vendor: supermicro
       model: S2600JF
@@ -61,7 +80,8 @@ nodes:
       cpu_cflags: hasewell
       cores: 12
       memory: 128G
-    disks: &disks                           # for nodes in the same pod may have the same configuration
+    # for nodes in the same pod may have the same configuration
+    disks: &disks
       - name: 'disk1'
         disk_capacity: 4906G
         disk_type: hdd
@@ -106,7 +126,8 @@ nodes:
         vlan: 204
   - name: pod1-node2
     node: *nodeparas
-    disks: *disks                           # disks are same as pod1-node1
+    # disks are same as pod1-node1
+    disks: *disks
     remote_mangement:
       <<: *remoteparas
       address: 10.4.7.8/24
@@ -133,4 +154,3 @@ nodes:
         speed: 10gb
         features: 'dpdk|sriov'
         mac_address: "00:1b:21:22:f8:b5"
-
index 4f46b95..528eb09 100644 (file)
@@ -1,37 +1,38 @@
+---
 nodes:
    - name: node-9
      tags: control
      arch: "x86_64"
      mac_address: "90:1b:0e:6b:e8:a8"
      power:
-       type: ipmi
-       address: n/a
-       user: n/a
-       pass: n/a
+        type: ipmi
+        address: n/a
+        user: n/a
+        pass: n/a
    - name: node-10
      tags: control
      arch: "x86_64"
      mac_address: "90:1b:0e:6b:e3:00"
      power:
-       type: ipmi
-       address: n/a
-       user: n/a
-       pass: n/a
+        type: ipmi
+        address: n/a
+        user: n/a
+        pass: n/a
    - name: node-11
      tags: control
      arch: "x86_64"
      mac_address: "90:1b:0e:6b:e5:b4"
      power:
-       type: ipmi
-       address: n/a
-       user: n/a
-       pass: n/a
+        type: ipmi
+        address: n/a
+        user: n/a
+        pass: n/a
    - name: node-12
      tags: compute
      arch: "x86_64"
      mac_address: "90:1b:0e:6b:e2:bc"
      power:
-       type: ipmi
-       address: n/a
-       user: n/a
-       pass: n/a
+        type: ipmi
+        address: n/a
+        user: n/a
+        pass: n/a
index 747461a..b8bee5d 100644 (file)
@@ -1,3 +1,4 @@
+---
 ##############################################################################
 ## Copyright (c) 2015 ZTE Corp. and others.
 ##
 
 nodes:
    - name: node1
-     tags: control      #optional param, other valid value "compute"
+     tags: control      # optional param, other valid value "compute"
      arch: "x86_64"
-     mac_address: "74:4A:A4:00:CF:DC" #pxe boot interface mac
+     mac_address: "74:4A:A4:00:CF:DC"  # pxe boot interface mac
      power:
-       type: ipmi
-       address: 192.168.1.101
-       user: zteroot
-       pass: superuser
+        type: ipmi
+        address: 192.168.1.101
+        user: zteroot
+        pass: superuser
    - name: node2
      tags: control
      arch: "x86_64"
      mac_address: "74:4A:A4:00:CE:CE"
      power:
-       type: ipmi
-       address: 192.168.1.102
-       user: zteroot
-       pass: superuser
+        type: ipmi
+        address: 192.168.1.102
+        user: zteroot
+        pass: superuser
    - name: node3
      tags: control
      arch: "x86_64"
      mac_address: "74:4A:A4:00:CF:58"
      power:
-       type: ipmi
-       address: 192.168.1.103
-       user: zteroot
-       pass: superuser
+        type: ipmi
+        address: 192.168.1.103
+        user: zteroot
+        pass: superuser
    - name: node4
      tags: compute
      arch: "x86_64"
      mac_address: "74:4A:A4:00:49:84"
      power:
-       type: ipmi
-       address: 192.168.1.104
-       user: zteroot
-       pass: superuser
+        type: ipmi
+        address: 192.168.1.104
+        user: zteroot
+        pass: superuser
    - name: node5
      tags: compute
      arch: "x86_64"
      mac_address: "74:4A:A4:00:CE:C2"
      power:
-       type: ipmi
-       address: 192.168.1.105
-       user: zteroot
-       pass: superuser
+        type: ipmi
+        address: 192.168.1.105
+        user: zteroot
+        pass: superuser
index 55d478f..c56b53d 100644 (file)
@@ -1,3 +1,4 @@
+---
 ##############################################################################
 ## Copyright (c) 2015 ZTE Corp. and others.
 ##
 
 nodes:
    - name: node1
-     tags: control      #optional param, other valid value "compute"
+     tags: control      # optional param, other valid value "compute"
      arch: "x86_64"
-     mac_address: "74:4A:A4:00:CD:72" #pxe boot interface mac
+     mac_address: "74:4A:A4:00:CD:72"  # pxe boot interface mac
      power:
-       type: ipmi
-       address: 192.168.1.106
-       user: zteroot
-       pass: superuser
+        type: ipmi
+        address: 192.168.1.106
+        user: zteroot
+        pass: superuser
    - name: node2
      tags: control
      arch: "x86_64"
      mac_address: "74:4A:A4:00:CA:CC"
      power:
-       type: ipmi
-       address: 192.168.1.107
-       user: zteroot
-       pass: superuser
+        type: ipmi
+        address: 192.168.1.107
+        user: zteroot
+        pass: superuser
    - name: node3
      tags: control
      arch: "x86_64"
      mac_address: "74:4A:A4:00:CD:12"
      power:
-       type: ipmi
-       address: 192.168.1.108
-       user: zteroot
-       pass: superuser
+        type: ipmi
+        address: 192.168.1.108
+        user: zteroot
+        pass: superuser
    - name: node4
      tags: compute
      arch: "x86_64"
      mac_address: "74:4A:A4:00:CF:40"
      power:
-       type: ipmi
-       address: 192.168.1.109
-       user: zteroot
-       pass: superuser
+        type: ipmi
+        address: 192.168.1.109
+        user: zteroot
+        pass: superuser
    - name: node5
      tags: compute
      arch: "x86_64"
      mac_address: "74:4A:A4:00:CE:D4"
      power:
-       type: ipmi
-       address: 192.168.1.110
-       user: zteroot
-       pass: superuser
+        type: ipmi
+        address: 192.168.1.110
+        user: zteroot
+        pass: superuser
index e3557fc..409be27 100644 (file)
@@ -1,3 +1,4 @@
+---
 ##############################################################################
 ## Copyright (c) 2015 ZTE Corp. and others.
 ##
@@ -13,44 +14,43 @@ nodes:
      arch: "x86_64"
      mac_address: "74:4a:a4:00:0b:85"
      power:
-       type: ipmi
-       address: 192.168.1.32 
-       user: zteroot
-       pass: superuser
+        type: ipmi
+        address: 192.168.1.32
+        user: zteroot
+        pass: superuser
    - name: node2
      tags: control
      arch: "x86_64"
      mac_address: "74:4a:a4:00:5c:5d"
      power:
-       type: ipmi
-       address: 192.168.1.33
-       user: zteroot
-       pass: superuser
+        type: ipmi
+        address: 192.168.1.33
+        user: zteroot
+        pass: superuser
    - name: node3
      tags: control
      arch: "x86_64"
      mac_address: "74:4a:a4:00:5c:35"
      power:
-       type: ipmi
-       address: 192.168.1.34
-       user: zteroot
-       pass: superuser
+        type: ipmi
+        address: 192.168.1.34
+        user: zteroot
+        pass: superuser
    - name: node4
      tags: compute
      arch: "x86_64"
      mac_address: "74:4a:a4:00:5c:69"
      power:
-       type: ipmi
-       address: 192.168.1.35
-       user: zteroot
-       pass: superuser
+        type: ipmi
+        address: 192.168.1.35
+        user: zteroot
+        pass: superuser
    - name: node5
      tags: compute
      arch: "x86_64"
      mac_address: "74:4a:a4:00:5c:6d"
      power:
-       type: ipmi
-       address: 192.168.1.36
-       user: zteroot
-       pass: superuser
-
+        type: ipmi
+        address: 192.168.1.36
+        user: zteroot
+        pass: superuser
index 2f02011..16b8c0f 100644 (file)
@@ -1,3 +1,4 @@
+---
 ##############################################################################
 # Copyright (c) 2016 Max Breitenfeldt and others.
 #
@@ -27,7 +28,9 @@ services:
         restart: always
         build: ./web/
         container_name: dg01
+        # yamllint disable rule:line-length
         command: bash -c "python manage.py migrate && python manage.py collectstatic --no-input && gunicorn pharos_dashboard.wsgi -b 0.0.0.0:8000"
+        # yamllint enable rule:line-length
         depends_on:
             - postgres
         links:
@@ -46,8 +49,8 @@ services:
         container_name: ps01
         env_file: config.env
         volumes:
-          - ./config/postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
-          - /var/lib/pharos_dashboard/postgresql:/var/lib/postgresql
+            - ./config/postgres/docker-entrypoint-initdb.d:/docker-entrypoint-initdb.d
+            - /var/lib/pharos_dashboard/postgresql:/var/lib/postgresql
 
     rabbitmq:
         restart: always
@@ -55,12 +58,14 @@ services:
         container_name: rm01
         env_file: config.env
         ports:
-          - "5672:5672"
-          
+            - "5672:5672"
+
     worker:
         restart: always
         build: ./worker/
+        # yamllint disable rule:line-length
         command: bash -c "celery -A pharos_dashboard worker -l info -B --schedule=~/celerybeat-schedule"
+        # yamllint enable rule:line-length
         env_file: config.env
         links:
             - postgres
index 6b3a6d0..f2146ff 100644 (file)
@@ -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"
-
index 6b3a6d0..f2146ff 100644 (file)
@@ -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"
-
index d0f5083..2ba768a 100644 (file)
@@ -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
index 34329cc..91c1be9 100644 (file)
@@ -1,3 +1,4 @@
+---
 # This configuration file defines Network Environment for a
 # Baremetal Deployment of OPNFV. It contains default values
 # for 5 following networks:
 #
 # "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
index d0f5083..2ba768a 100644 (file)
@@ -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
index 33d9560..705e848 100644 (file)
@@ -1,3 +1,4 @@
+---
 # This configuration file defines Network Environment for a
 # Baremetal Deployment of OPNFV. It contains default values
 # for 5 following networks:
 #
 # "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: