Fix or silence all yamllint warnings

Change-Id: Iface28ab770beee00374afb902ef4f9c983538f5 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 597e4b55f57001ead8e90f30e2e3211c7d705ca8)
author: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 2017-09-25 04:36:02 +0200
committer: Alexandru Avadanii <Alexandru.Avadanii@enea.com> 2017-09-26 00:40:22 +0000
commit: 53282e13c6c3937f5a3b9e91e72104252a38762f (patch)
tree: 09c49c53a35b06ace30e0ca46bb6a896a52032de /mcp
parent: 91a3426ee125951d54d7e80ee8c133168221fcba (diff)
100 files changed, 1288 insertions, 1170 deletions
diff --git a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
index ad1b8a7ab..ca5b6a24d 100644
--- a/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-nosdn-nofeature-ha.yaml
@@ -1,3 +1,4 @@
+---
 cluster:
   domain: baremetal-mcp-ocata-ovs-ha.local
   states:
diff --git a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
index c5820be09..f558f0a4b 100644
--- a/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-nosdn-ovs-ha.yaml
@@ -1,3 +1,4 @@
+---
 cluster:
   domain: baremetal-mcp-ocata-ovs-dpdk-ha.local
   states:
diff --git a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
index 20d9107ca..893b6797b 100644
--- a/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
+++ b/mcp/config/scenario/baremetal/os-odl-nofeature-ha.yaml
@@ -1,3 +1,4 @@
+---
 cluster:
   domain: baremetal-mcp-ocata-odl-ha.local
   states:
diff --git a/mcp/config/scenario/defaults-aarch64.yaml b/mcp/config/scenario/defaults-aarch64.yaml
index 17fbbfcbe..0790bbb7c 100644
--- a/mcp/config/scenario/defaults-aarch64.yaml
+++ b/mcp/config/scenario/defaults-aarch64.yaml
@@ -1,6 +1,7 @@
+---
+# yamllint disable-line rule:line-length
 base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img
 virtual:
   default:
     vcpus: 6
     ram: 4096
-
diff --git a/mcp/config/scenario/defaults-x86_64.yaml b/mcp/config/scenario/defaults-x86_64.yaml
index b841e88c9..adb6f6241 100644
--- a/mcp/config/scenario/defaults-x86_64.yaml
+++ b/mcp/config/scenario/defaults-x86_64.yaml
@@ -1,6 +1,7 @@
+---
+# yamllint disable-line rule:line-length
 base_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-amd64-disk1.img
 virtual:
   default:
     vcpus: 2
     ram: 4096
-
diff --git a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
index 7208d89f2..862029912 100644
--- a/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
+++ b/mcp/config/scenario/virtual/os-nosdn-nofeature-noha.yaml
@@ -1,3 +1,4 @@
+---
 cluster:
   domain: virtual-mcp-ocata-ovs.local
   states:
diff --git a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
index 540761cbf..02977f793 100644
--- a/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
+++ b/mcp/config/scenario/virtual/os-nosdn-ovs-noha.yaml
@@ -1,3 +1,4 @@
+---
 cluster:
   domain: virtual-mcp-ocata-ovs-dpdk.local
   states:
diff --git a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
index de95e503d..b3684c109 100644
--- a/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
+++ b/mcp/config/scenario/virtual/os-odl-nofeature-noha.yaml
@@ -1,3 +1,4 @@
+---
 cluster:
   domain: virtual-mcp-ocata-odl-router.local
   states:
diff --git a/mcp/metadata/service/opendaylight/server/single.yml b/mcp/metadata/service/opendaylight/server/single.yml
index 4ee0aafde..aca1b5d62 100644
--- a/mcp/metadata/service/opendaylight/server/single.yml
+++ b/mcp/metadata/service/opendaylight/server/single.yml
@@ -1,8 +1,9 @@
+---
 applications:
-- opendaylight
+  - opendaylight
 parameters:
   opendaylight:
     server:
-      enabled: True
+      enabled: 'True'
       logging:
         engine: syslog
diff --git a/mcp/metadata/service/opendaylight/support.yml b/mcp/metadata/service/opendaylight/support.yml
index 0e992367e..3b3c02761 100644
--- a/mcp/metadata/service/opendaylight/support.yml
+++ b/mcp/metadata/service/opendaylight/support.yml
@@ -1,3 +1,4 @@
+---
 parameters:
   opendaylight:
     _support:
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml
index daa89de66..4fb2adf55 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/aarch64/init.yml
@@ -1,5 +1,7 @@
+---
 parameters:
   _param:
+    # yamllint disable-line rule:line-length
     salt_control_xenial_image: https://cloud-images.ubuntu.com/xenial/current/xenial-server-cloudimg-arm64-uefi1.img
 
     # VMs spawned on Foundation Node / Jump Host net ifaces (max 4)
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/init.yml
index b8bde832e..295271d81 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/init.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/init.yml
@@ -1,3 +1,4 @@
+---
 classes:
-- cluster.all-mcp-ocata-common.arch
-- cluster.all-mcp-ocata-common.opnfv
+  - cluster.all-mcp-ocata-common.arch
+  - cluster.all-mcp-ocata-common.opnfv
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml
index 4cb4f2f8b..c9be2c2ab 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/init.yml
@@ -1,3 +1,4 @@
+---
 classes:
-- cluster.all-mcp-ocata-common.opnfv.runtime
-- cluster.all-mcp-ocata-common.opnfv.pod_config
+  - cluster.all-mcp-ocata-common.opnfv.runtime
+  - cluster.all-mcp-ocata-common.opnfv.pod_config
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml
index b17816fe5..90c3c8556 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/opnfv/pod_config.yml
@@ -1,3 +1,4 @@
+---
 parameters:
   _param:
     # infra service addresses
diff --git a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml
index 669eb7dc4..d7d3945aa 100644
--- a/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml
+++ b/mcp/reclass/classes/cluster/all-mcp-ocata-common/x86_64/init.yml
@@ -1,5 +1,7 @@
+---
 parameters:
   _param:
+    # yamllint disable-line rule:line-length
     salt_control_xenial_image: http://apt.mirantis.com/images/ubuntu-16-04-x64-latest.qcow2
 
     # VMs spawned on Foundation Node / Jump Host net ifaces (max 4)
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/haproxy_openstack_api.yml
index e63e9d5c9..7c43c2fbb 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/haproxy_openstack_api.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-common/haproxy_openstack_api.yml
@@ -1,3 +1,4 @@
+---
 parameters:
   _param:
     haproxy_check: check inter 15s fastinter 2s downinter 4s rise 3 fall 3
@@ -8,159 +9,159 @@ parameters:
           type: openstack-service
           service_name: cinder
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8776
+            - address: ${_param:cluster_vip_address}
+              port: 8776
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8776
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 8776
+              params: ${_param:haproxy_check}
         glance_api:
           type: openstack-service
           service_name: glance
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 9292
+            - address: ${_param:cluster_vip_address}
+              port: 9292
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 9292
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 9292
+              params: ${_param:haproxy_check}
         glance_registry_api:
           type: general-service
           service_name: glance
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 9191
+            - address: ${_param:cluster_vip_address}
+              port: 9191
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 9191
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 9191
+              params: ${_param:haproxy_check}
         glare:
           type: general-service
           service_name: glare
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 9494
+            - address: ${_param:cluster_vip_address}
+              port: 9494
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 9494
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 9494
+              params: ${_param:haproxy_check}
         heat_cloudwatch_api:
           type: openstack-service
           service_name: heat
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8003
+            - address: ${_param:cluster_vip_address}
+              port: 8003
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8003
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 8003
+              params: ${_param:haproxy_check}
         heat_api:
           type: openstack-service
           service_name: heat
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8004
+            - address: ${_param:cluster_vip_address}
+              port: 8004
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8004
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 8004
+              params: ${_param:haproxy_check}
         heat_cfn_api:
           type: openstack-service
           service_name: heat
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8000
+            - address: ${_param:cluster_vip_address}
+              port: 8000
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8000
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 8000
+              params: ${_param:haproxy_check}
         keystone_public_api:
           type: openstack-service
           service_name: keystone
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 5000
+            - address: ${_param:cluster_vip_address}
+              port: 5000
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 5000
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 5000
+              params: ${_param:haproxy_check}
         keystone_admin_api:
           type: openstack-service
           service_name: keystone
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 35357
+            - address: ${_param:cluster_vip_address}
+              port: 35357
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 35357
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 35357
+              params: ${_param:haproxy_check}
         neutron_api:
           type: openstack-service
           service_name: neutron
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 9696
+            - address: ${_param:cluster_vip_address}
+              port: 9696
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 9696
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 9696
+              params: ${_param:haproxy_check}
         nova_placement_api:
           mode: http
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8778
+            - address: ${_param:cluster_vip_address}
+              port: 8778
           options:
-          - httpclose
-          - httplog
+            - httpclose
+            - httplog
           health-check:
             http:
               options:
-              - expect status 401
+                - expect status 401
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8778
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 8778
+              params: ${_param:haproxy_check}
         nova_ec2_api:
           type: general-service
           service_name: nova
           check: false
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8773
+            - address: ${_param:cluster_vip_address}
+              port: 8773
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8773
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 8773
+              params: ${_param:haproxy_check}
         nova_api:
           type: openstack-service
           service_name: nova
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8774
+            - address: ${_param:cluster_vip_address}
+              port: 8774
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8774
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 8774
+              params: ${_param:haproxy_check}
         nova_metadata_api:
           type: openstack-service
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8775
+            - address: ${_param:cluster_vip_address}
+              port: 8775
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8775
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 8775
+              params: ${_param:haproxy_check}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
index 3f72e182f..4cf2a60a6 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/config.yml
@@ -1,24 +1,25 @@
+---
 classes:
-- service.git.client
-- system.linux.system.single
-- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.saltstack.xenial
-- system.salt.master.api
-- system.salt.master.pkg
-- system.salt.minion.ca.salt_master
-- system.reclass.storage.salt
-- system.reclass.storage.system.physical_control_cluster
-- system.reclass.storage.system.openstack_control_cluster
-- system.reclass.storage.system.openstack_proxy_cluster
-- system.reclass.storage.system.openstack_database_cluster
-- system.reclass.storage.system.openstack_message_queue_cluster
-- system.reclass.storage.system.opendaylight_control_single
-- system.reclass.storage.system.openstack_telemetry_cluster
-# - system.reclass.storage.system.stacklight_log_cluster
-# - system.reclass.storage.system.stacklight_monitor_cluster
-# - system.reclass.storage.system.stacklight_telemetry_cluster
-- system.reclass.storage.system.infra_maas_single
-- cluster.baremetal-mcp-ocata-odl-ha.infra
+  - service.git.client
+  - system.linux.system.single
+  - system.linux.system.repo.mcp.salt
+  - system.linux.system.repo.saltstack.xenial
+  - system.salt.master.api
+  - system.salt.master.pkg
+  - system.salt.minion.ca.salt_master
+  - system.reclass.storage.salt
+  - system.reclass.storage.system.physical_control_cluster
+  - system.reclass.storage.system.openstack_control_cluster
+  - system.reclass.storage.system.openstack_proxy_cluster
+  - system.reclass.storage.system.openstack_database_cluster
+  - system.reclass.storage.system.openstack_message_queue_cluster
+  - system.reclass.storage.system.opendaylight_control_single
+  - system.reclass.storage.system.openstack_telemetry_cluster
+  # - system.reclass.storage.system.stacklight_log_cluster
+  # - system.reclass.storage.system.stacklight_monitor_cluster
+  # - system.reclass.storage.system.stacklight_telemetry_cluster
+  - system.reclass.storage.system.infra_maas_single
+  - cluster.baremetal-mcp-ocata-odl-ha.infra
 parameters:
   _param:
     salt_master_base_environment: prd
@@ -29,6 +30,7 @@ parameters:
     single_address: ${_param:infra_config_address}
     deploy_address: ${_param:infra_config_deploy_address}
     salt_master_host: ${_param:infra_config_deploy_address}
+    # yamllint disable rule:line-length
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
   linux:
     network:
@@ -80,16 +82,16 @@ parameters:
         openstack_proxy_node02:
           params:
             linux_system_codename: xenial
-#        stacklight_log_node01:
-#          classes:
-#          - system.elasticsearch.client.single
-#        stacklight_monitor_node01:
-#          classes:
-#          - system.grafana.client.single
-#          - system.kibana.client.single
+        # stacklight_log_node01:
+        #   classes:
+        #   - system.elasticsearch.client.single
+        # stacklight_monitor_node01:
+        #   classes:
+        #   - system.grafana.client.single
+        #   - system.kibana.client.single
         openstack_control_node01:
           classes:
-          - cluster.${_param:cluster_name}.openstack.control_init
+            - cluster.${_param:cluster_name}.openstack.control_init
           params:
             linux_system_codename: xenial
         openstack_control_node02:
@@ -100,7 +102,7 @@ parameters:
             linux_system_codename: xenial
         openstack_database_node01:
           classes:
-          - cluster.${_param:cluster_name}.openstack.database_init
+            - cluster.${_param:cluster_name}.openstack.database_init
           params:
             linux_system_codename: xenial
         openstack_database_node02:
@@ -113,7 +115,7 @@ parameters:
           name: ${_param:openstack_compute_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.openstack.compute
+            - cluster.${_param:cluster_name}.openstack.compute
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: xenial
@@ -125,7 +127,7 @@ parameters:
           name: ${_param:openstack_compute_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.openstack.compute
+            - cluster.${_param:cluster_name}.openstack.compute
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: xenial
@@ -135,7 +137,7 @@ parameters:
             external_address: ${_param:openstack_compute_node02_external_address}
         opendaylight_control_node01:
           classes:
-          - cluster.${_param:cluster_name}.opendaylight.control
+            - cluster.${_param:cluster_name}.opendaylight.control
           params:
             linux_system_codename: xenial
             single_address: ${_param:opendaylight_server_node01_single_address}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
index 29b25216e..b1cd5d21c 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/init.yml
@@ -1,16 +1,17 @@
+---
 classes:
-- system.linux.system.single
-- cluster.all-mcp-ocata-common
-- cluster.baremetal-mcp-ocata-odl-ha.openstack
-# - cluster.baremetal-mcp-ocata-odl-ha.stacklight
-# - cluster.baremetal-mcp-ocata-odl-ha.stacklight.client
+  - system.linux.system.single
+  - cluster.all-mcp-ocata-common
+  - cluster.baremetal-mcp-ocata-odl-ha.openstack
+  # - cluster.baremetal-mcp-ocata-odl-ha.stacklight
+  # - cluster.baremetal-mcp-ocata-odl-ha.stacklight.client
 parameters:
   _param:
     apt_mk_version: nightly
     mcp_repo_version: 1.1
     cluster_name: baremetal-mcp-ocata-odl-ha
     cluster_domain: ${_param:cluster_name}.local
-#    stacklight_environment: ${_param:cluster_domain}
+    # stacklight_environment: ${_param:cluster_domain}
     reclass_data_revision: master
     cluster_public_host: ${_param:openstack_proxy_address}
     infra_config_hostname: cfg01
@@ -54,6 +55,7 @@ parameters:
       address: ${_param:single_address}
       netmask: 255.255.255.0
 
+    # yamllint disable-line rule:line-length
     salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
   linux:
     system:
@@ -67,30 +69,30 @@ parameters:
         cfg01:
           address: ${_param:infra_config_address}
           names:
-          - cfg01
-          - cfg01.${_param:cluster_domain}
+            - cfg01
+            - cfg01.${_param:cluster_domain}
         cfg:
           address: ${_param:infra_config_address}
           names:
-          - ${_param:infra_config_hostname}
-          - ${_param:infra_config_hostname}.${_param:cluster_domain}
+            - ${_param:infra_config_hostname}
+            - ${_param:infra_config_hostname}.${_param:cluster_domain}
         mas01:
           address: ${_param:infra_maas_node01_address}
           names:
-          - ${_param:infra_maas_node01_hostname}
-          - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain}
+            - ${_param:infra_maas_node01_hostname}
+            - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain}
         kvm01:
           address: ${_param:infra_kvm_node01_address}
           names:
-          - ${_param:infra_kvm_node01_hostname}
-          - ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+            - ${_param:infra_kvm_node01_hostname}
+            - ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
         kvm02:
           address: ${_param:infra_kvm_node02_address}
           names:
-          - ${_param:infra_kvm_node02_hostname}
-          - ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+            - ${_param:infra_kvm_node02_hostname}
+            - ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
         kvm03:
           address: ${_param:infra_kvm_node03_address}
           names:
-          - ${_param:infra_kvm_node03_hostname}
-          - ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+            - ${_param:infra_kvm_node03_hostname}
+            - ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
index e55bcbf25..99ac02e34 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/kvm.yml
@@ -1,21 +1,22 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- service.keepalived.cluster.single
-- system.glusterfs.server.volume.glance
-- system.glusterfs.server.volume.keystone
-- system.glusterfs.server.cluster
-- system.salt.control.virt
-- system.salt.control.cluster.openstack_control_cluster
-- system.salt.control.cluster.openstack_proxy_cluster
-- system.salt.control.cluster.openstack_database_cluster
-- system.salt.control.cluster.openstack_message_queue_cluster
-- system.salt.control.cluster.openstack_telemetry_cluster
-# - system.salt.control.cluster.stacklight_server_cluster
-# - system.salt.control.cluster.stacklight_log_cluster
-# - system.salt.control.cluster.stacklight_telemetry_cluster
-- cluster.baremetal-mcp-ocata-odl-ha.infra
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - service.keepalived.cluster.single
+  - system.glusterfs.server.volume.glance
+  - system.glusterfs.server.volume.keystone
+  - system.glusterfs.server.cluster
+  - system.salt.control.virt
+  - system.salt.control.cluster.openstack_control_cluster
+  - system.salt.control.cluster.openstack_proxy_cluster
+  - system.salt.control.cluster.openstack_database_cluster
+  - system.salt.control.cluster.openstack_message_queue_cluster
+  - system.salt.control.cluster.openstack_telemetry_cluster
+  # - system.salt.control.cluster.stacklight_server_cluster
+  # - system.salt.control.cluster.stacklight_log_cluster
+  # - system.salt.control.cluster.stacklight_telemetry_cluster
+  - cluster.baremetal-mcp-ocata-odl-ha.infra
 parameters:
   _param:
     linux_system_codename: xenial
@@ -28,8 +29,8 @@ parameters:
     deploy_nic: enp6s0
   salt:
     control:
-      size: #RAM 4096,8192,16384,32768,65536
-      ##Default production sizing
+      size:  # RAM 4096,8192,16384,32768,65536
+        # Default production sizing
         openstack.control:
           cpu: 4
           ram: 12288
@@ -55,21 +56,21 @@ parameters:
           ram: 2048
           disk_profile: small
           net_profile: default
-#        stacklight.log:
-#          cpu: 2
-#          ram: 4096
-#          disk_profile: xxlarge
-#          net_profile: default
-#        stacklight.server:
-#          cpu: 2
-#          ram: 4096
-#          disk_profile: small
-#          net_profile: default
-#        stacklight.telemetry:
-#          cpu: 2
-#          ram: 4096
-#          disk_profile: xxlarge
-#          net_profile: default
+        # stacklight.log:
+        #   cpu: 2
+        #   ram: 4096
+        #   disk_profile: xxlarge
+        #   net_profile: default
+        # stacklight.server:
+        #   cpu: 2
+        #   ram: 4096
+        #   disk_profile: small
+        #   net_profile: default
+        # stacklight.telemetry:
+        #   cpu: 2
+        #   ram: 4096
+        #   disk_profile: xxlarge
+        #   net_profile: default
         opendaylight.server:
           cpu: 4
           ram: 6144
@@ -80,6 +81,7 @@ parameters:
           node:
             odl01:
               name: ${_param:opendaylight_server_node01_hostname}
+              # yamllint disable-line rule:line-length
               provider: ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
               image: ${_param:salt_control_xenial_image}
               size: opendaylight.server
@@ -131,9 +133,9 @@ parameters:
             - ${_param:cluster_node02_address}:/srv/glusterfs/nova_instances
             - ${_param:cluster_node03_address}:/srv/glusterfs/nova_instances
           options:
-            cluster.readdir-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
+            cluster.readdir-optimize: 'On'
+            nfs.disable: 'On'
+            network.remote-dio: 'On'
             diagnostics.client-log-level: WARNING
             diagnostics.brick-log-level: WARNING
   linux:
@@ -152,10 +154,10 @@ parameters:
           proto: dhcp
           type: bridge
           name_servers:
-          - 8.8.8.8
-          - 8.8.4.4
+            - 8.8.8.8
+            - 8.8.4.4
           use_interfaces:
-          - ${_param:deploy_nic}
+            - ${_param:deploy_nic}
           noifupdown: true
         vlan300:
           enabled: true
@@ -163,7 +165,7 @@ parameters:
           type: vlan
           name: ${_param:deploy_nic}.300
           use_interfaces:
-          - ${_param:deploy_nic}
+            - ${_param:deploy_nic}
         br-ctl:
           enabled: true
           type: bridge
@@ -171,4 +173,4 @@ parameters:
           address: ${_param:single_address}
           netmask: 255.255.255.0
           use_interfaces:
-          - ${_param:deploy_nic}.300
+            - ${_param:deploy_nic}.300
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
index 64ae85a38..2a2fedb86 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/infra/maas.yml
@@ -1,7 +1,8 @@
+---
 classes:
-- system.linux.system.repo.saltstack.xenial
-- system.maas.region.single
-- cluster.baremetal-mcp-ocata-odl-ha.infra
+  - system.linux.system.repo.saltstack.xenial
+  - system.maas.region.single
+  - cluster.baremetal-mcp-ocata-odl-ha.infra
 parameters:
   _param:
     dhcp_interface: ens3
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml
index b2c795fdd..2c347131d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/init.yml
@@ -1,4 +1,5 @@
+---
 classes:
-- cluster.all-mcp-ocata-common
-- cluster.baremetal-mcp-ocata-odl-ha.infra
-- cluster.baremetal-mcp-ocata-odl-ha.openstack
+  - cluster.all-mcp-ocata-common
+  - cluster.baremetal-mcp-ocata-odl-ha.infra
+  - cluster.baremetal-mcp-ocata-odl-ha.openstack
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml
index 0a01af746..d473a07b4 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/opendaylight/control.yml
@@ -1,9 +1,10 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.opendaylight.server.single
-- cluster.baremetal-mcp-ocata-odl-ha
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - system.opendaylight.server.single
+  - cluster.baremetal-mcp-ocata-odl-ha
 parameters:
   _param:
     linux_system_codename: xenial
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml
index b7f9f3fe7..160d0bd62 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/benchmark.yml
@@ -1,5 +1,6 @@
+---
 classes:
-- cluster.baremetal-mcp-ocata-odl-ha
+  - cluster.baremetal-mcp-ocata-odl-ha
 parameters:
   linux:
     network:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
index d2495c26a..82b1a6eff 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/compute.yml
@@ -1,18 +1,19 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.linux.storage.loopback
-- system.glusterfs.client.cluster
-- system.nova.compute.cluster
-- system.nova.compute.nfv.hugepages
-- system.nova.compute.nfv.cpu_pinning
-- system.neutron.gateway.opendaylight.single
-- system.neutron.gateway.cluster
-- system.cinder.volume.single
-- system.cinder.volume.backend.lvm
-- system.ceilometer.agent.cluster
-- cluster.baremetal-mcp-ocata-odl-ha.infra
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - system.linux.storage.loopback
+  - system.glusterfs.client.cluster
+  - system.nova.compute.cluster
+  - system.nova.compute.nfv.hugepages
+  - system.nova.compute.nfv.cpu_pinning
+  - system.neutron.gateway.opendaylight.single
+  - system.neutron.gateway.cluster
+  - system.cinder.volume.single
+  - system.cinder.volume.backend.lvm
+  - system.ceilometer.agent.cluster
+  - cluster.baremetal-mcp-ocata-odl-ha.infra
 parameters:
   _param:
     cluster_vip_address: ${_param:openstack_control_address}
@@ -33,8 +34,8 @@ parameters:
     keepalived_vip_virtual_router_id: 69
     loopback_device_size: 20
     neutron_agents:
-    - neutron-dhcp-agent
-    - neutron-metadata-agent
+      - neutron-dhcp-agent
+      - neutron-metadata-agent
   opendaylight:
     client:
       ovsdb_server_iface: ptcp:6639:127.0.0.1
@@ -56,6 +57,7 @@ parameters:
           server: ${_param:glusterfs_service_host}
           user: nova
           group: nova
+          # yamllint disable-line rule:line-length
           opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}"
   linux:
     system:
@@ -89,21 +91,21 @@ parameters:
           netmask: 255.255.255.0
           mtu: 1500
           use_interfaces:
-          - ${_param:tenant_nic}.302
+            - ${_param:tenant_nic}.302
         vlan300:
           enabled: true
           proto: manual
           type: vlan
           name: ${_param:mgmt_nic}.300
           use_interfaces:
-          - ${_param:mgmt_nic}
+            - ${_param:mgmt_nic}
         vlan302:
           enabled: true
           proto: manual
           type: vlan
           name: ${_param:tenant_nic}.302
           use_interfaces:
-          - ${_param:tenant_nic}
+            - ${_param:tenant_nic}
         br-ctl:
           enabled: true
           type: bridge
@@ -111,7 +113,7 @@ parameters:
           address: ${_param:single_address}
           netmask: 255.255.255.0
           use_interfaces:
-          - ${_param:mgmt_nic}.300
+            - ${_param:mgmt_nic}.300
         br-floating:
           enabled: true
           type: ovs_bridge
@@ -128,7 +130,6 @@ parameters:
           address: ${_param:external_address}
           netmask: 255.255.255.0
           use_interfaces:
-          - ${_param:external_nic}
+            - ${_param:external_nic}
           use_ovs_ports:
-          - float-to-ex
-
+            - float-to-ex
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
index b46e23da7..9b72199ef 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control.yml
@@ -1,26 +1,27 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.ceilometer.client
-- system.memcached.server.single
-- system.keystone.server.cluster
-- system.keystone.server.wsgi
-- system.glance.control.cluster
-- system.neutron.control.opendaylight.cluster
-- system.nova.control.cluster
-- system.cinder.control.cluster
-- system.cinder.control.backend.lvm
-- system.heat.server.cluster
-- system.designate.server.cluster
-- system.designate.server.backend.bind
-- system.bind.server.single
-- system.haproxy.proxy.listen.openstack.nova-placement
-- system.haproxy.proxy.listen.openstack.glare
-- system.glusterfs.client.cluster
-- system.glusterfs.client.volume.glance
-- system.glusterfs.client.volume.keystone
-- cluster.baremetal-mcp-ocata-odl-ha.infra
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - system.ceilometer.client
+  - system.memcached.server.single
+  - system.keystone.server.cluster
+  - system.keystone.server.wsgi
+  - system.glance.control.cluster
+  - system.neutron.control.opendaylight.cluster
+  - system.nova.control.cluster
+  - system.cinder.control.cluster
+  - system.cinder.control.backend.lvm
+  - system.heat.server.cluster
+  - system.designate.server.cluster
+  - system.designate.server.backend.bind
+  - system.bind.server.single
+  - system.haproxy.proxy.listen.openstack.nova-placement
+  - system.haproxy.proxy.listen.openstack.glare
+  - system.glusterfs.client.cluster
+  - system.glusterfs.client.volume.glance
+  - system.glusterfs.client.volume.keystone
+  - cluster.baremetal-mcp-ocata-odl-ha.infra
 parameters:
   _param:
     keepalived_vip_interface: ens3
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml
index e759c0c8d..79c387940 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/control_init.yml
@@ -1,9 +1,10 @@
+---
 classes:
-- system.keystone.client.single
-- system.keystone.client.service.aodh
-- system.keystone.client.service.ceilometer
-- system.keystone.client.service.nova21
-- system.keystone.client.service.nova-placement
-- system.keystone.client.service.glare
-- system.keystone.client.service.cinder3
-- system.keystone.client.service.designate
+  - system.keystone.client.single
+  - system.keystone.client.service.aodh
+  - system.keystone.client.service.ceilometer
+  - system.keystone.client.service.nova21
+  - system.keystone.client.service.nova-placement
+  - system.keystone.client.service.glare
+  - system.keystone.client.service.cinder3
+  - system.keystone.client.service.designate
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml
index 9748c4cd4..ddcc196ae 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/dashboard.yml
@@ -1,6 +1,7 @@
+---
 classes:
-- system.horizon.server.single
-- cluster.baremetal-mcp-ocata-odl-ha
+  - system.horizon.server.single
+  - cluster.baremetal-mcp-ocata-odl-ha
 parameters:
   _param:
     horizon_site_branding: OpenStack Dashboard
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
index e61a4699f..e59c479ee 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database.yml
@@ -1,19 +1,20 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.galera.server.cluster
-- system.galera.server.database.aodh
-- system.galera.server.database.ceilometer
-- system.galera.server.database.cinder
-- system.galera.server.database.designate
-- system.galera.server.database.glance
-- system.galera.server.database.grafana
-- system.galera.server.database.heat
-- system.galera.server.database.keystone
-- system.galera.server.database.nova
-- system.galera.server.database.neutron
-- cluster.baremetal-mcp-ocata-odl-ha
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - system.galera.server.cluster
+  - system.galera.server.database.aodh
+  - system.galera.server.database.ceilometer
+  - system.galera.server.database.cinder
+  - system.galera.server.database.designate
+  - system.galera.server.database.glance
+  - system.galera.server.database.grafana
+  - system.galera.server.database.heat
+  - system.galera.server.database.keystone
+  - system.galera.server.database.nova
+  - system.galera.server.database.neutron
+  - cluster.baremetal-mcp-ocata-odl-ha
 parameters:
   _param:
     keepalived_vip_interface: ens3
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml
index b16f05593..5dcb9c9e1 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/database_init.yml
@@ -1,2 +1,3 @@
+---
 classes:
-- system.mysql.client.single
+  - system.mysql.client.single
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
index e49a2052d..16bdc0671 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/init.yml
@@ -1,3 +1,4 @@
+---
 parameters:
   _param:
 
@@ -56,6 +57,7 @@ parameters:
 
     # opendaylight options
     opendaylight_server_node01_single_address: 10.167.4.111
+    # yamllint disable rule:line-length
     opendaylight_service_host: ${_param:opendaylight_server_node01_single_address}
     opendaylight_server_node01_hostname: odl01
     opendaylight_router: odl-router_v2
@@ -83,17 +85,17 @@ parameters:
 
     openstack_region: RegionOne
     admin_email: root@localhost
-    ##Neutron osv/nodvr
-    neutron_control_dvr: False
+    # Neutron osv/nodvr
+    neutron_control_dvr: 'False'
     neutron_tenant_network_types: "flat,vxlan"
-    neutron_l3_ha: True
+    neutron_l3_ha: 'True'
     neutron_global_physnet_mtu: 1500
     neutron_external_mtu: 1500
-    neutron_gateway_dvr: False
+    neutron_gateway_dvr: 'False'
     neutron_gateway_agent_mode: legacy
-    neutron_compute_dvr: False
+    neutron_compute_dvr: 'False'
     neutron_compute_agent_mode: legacy
-    neutron_compute_external_access: True
+    neutron_compute_external_access: 'True'
     galera_server_cluster_name: openstack_cluster
     galera_server_maintenance_password: opnfv_secret
     galera_server_admin_password: opnfv_secret
@@ -188,14 +190,14 @@ parameters:
       rndc_key_file: /etc/designate/rndc.key
     designate_version: ${_param:openstack_version}
     # Billing
-    #keystone_billometer_password: opnfv_secret
-    #keystone_billometer_address: ${_param:billometer_service_host}
-    #billometer_service_host: ${_param:openstack_billing_address}
-    #billometer_version: ${_param:openstack_version}
-    #billometer_secret_key: opnfv_secretpasswordpasswordpassword
-    #billometer_identity_password: ${_param:keystone_billometer_password}
-    #billometer_identity_host: ${_param:openstack_control_address}
-    #billometer_identity_token: ${_param:keystone_service_token}
+    # keystone_billometer_password: opnfv_secret
+    # keystone_billometer_address: ${_param:billometer_service_host}
+    # billometer_service_host: ${_param:openstack_billing_address}
+    # billometer_version: ${_param:openstack_version}
+    # billometer_secret_key: opnfv_secretpasswordpasswordpassword
+    # billometer_identity_password: ${_param:keystone_billometer_password}
+    # billometer_identity_host: ${_param:openstack_control_address}
+    # billometer_identity_token: ${_param:keystone_service_token}
   linux:
     system:
       repo:
@@ -214,120 +216,120 @@ parameters:
         prx:
           address: ${_param:openstack_proxy_address}
           names:
-          - ${_param:openstack_proxy_hostname}
-          - ${_param:openstack_proxy_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_proxy_hostname}
+            - ${_param:openstack_proxy_hostname}.${_param:cluster_domain}
         prx01:
           address: ${_param:openstack_proxy_node01_address}
           names:
-          - ${_param:openstack_proxy_node01_hostname}
-          - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_proxy_node01_hostname}
+            - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain}
         prx02:
           address: ${_param:openstack_proxy_node02_address}
           names:
-          - ${_param:openstack_proxy_node02_hostname}
-          - ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_proxy_node02_hostname}
+            - ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain}
         ctl:
           address: ${_param:openstack_control_address}
           names:
-          - ${_param:openstack_control_hostname}
-          - ${_param:openstack_control_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_control_hostname}
+            - ${_param:openstack_control_hostname}.${_param:cluster_domain}
         ctl01:
           address: ${_param:openstack_control_node01_address}
           names:
-          - ${_param:openstack_control_node01_hostname}
-          - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_control_node01_hostname}
+            - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
         ctl02:
           address: ${_param:openstack_control_node02_address}
           names:
-          - ${_param:openstack_control_node02_hostname}
-          - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_control_node02_hostname}
+            - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
         ctl03:
           address: ${_param:openstack_control_node03_address}
           names:
-          - ${_param:openstack_control_node03_hostname}
-          - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_control_node03_hostname}
+            - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
         msg:
           address: ${_param:openstack_message_queue_address}
           names:
-          - ${_param:openstack_message_queue_hostname}
-          - ${_param:openstack_message_queue_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_message_queue_hostname}
+            - ${_param:openstack_message_queue_hostname}.${_param:cluster_domain}
         msg01:
           address: ${_param:openstack_message_queue_node01_address}
           names:
-          - ${_param:openstack_message_queue_node01_hostname}
-          - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_message_queue_node01_hostname}
+            - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain}
         msg02:
           address: ${_param:openstack_message_queue_node02_address}
           names:
-          - ${_param:openstack_message_queue_node02_hostname}
-          - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_message_queue_node02_hostname}
+            - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain}
         msg03:
           address: ${_param:openstack_message_queue_node03_address}
           names:
-          - ${_param:openstack_message_queue_node03_hostname}
-          - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_message_queue_node03_hostname}
+            - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain}
         dbs:
           address: ${_param:openstack_database_address}
           names:
-          - ${_param:openstack_database_hostname}
-          - ${_param:openstack_database_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_database_hostname}
+            - ${_param:openstack_database_hostname}.${_param:cluster_domain}
         dbs01:
           address: ${_param:openstack_database_node01_address}
           names:
-          - ${_param:openstack_database_node01_hostname}
-          - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_database_node01_hostname}
+            - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain}
         dbs02:
           address: ${_param:openstack_database_node02_address}
           names:
-          - ${_param:openstack_database_node02_hostname}
-          - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_database_node02_hostname}
+            - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain}
         dbs03:
           address: ${_param:openstack_database_node03_address}
           names:
-          - ${_param:openstack_database_node03_hostname}
-          - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_database_node03_hostname}
+            - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain}
         mdb:
           address: ${_param:openstack_telemetry_address}
           names:
-          - ${_param:openstack_telemetry_hostname}
-          - ${_param:openstack_telemetry_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_telemetry_hostname}
+            - ${_param:openstack_telemetry_hostname}.${_param:cluster_domain}
         mdb01:
           address: ${_param:openstack_telemetry_node01_address}
           names:
-          - ${_param:openstack_telemetry_node01_hostname}
-          - ${_param:openstack_telemetry_node01_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_telemetry_node01_hostname}
+            - ${_param:openstack_telemetry_node01_hostname}.${_param:cluster_domain}
         mdb02:
           address: ${_param:openstack_telemetry_node02_address}
           names:
-          - ${_param:openstack_telemetry_node02_hostname}
-          - ${_param:openstack_telemetry_node02_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_telemetry_node02_hostname}
+            - ${_param:openstack_telemetry_node02_hostname}.${_param:cluster_domain}
         mdb03:
           address: ${_param:openstack_telemetry_node03_address}
           names:
-          - ${_param:openstack_telemetry_node03_hostname}
-          - ${_param:openstack_telemetry_node03_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_telemetry_node03_hostname}
+            - ${_param:openstack_telemetry_node03_hostname}.${_param:cluster_domain}
         cmp001:
           address: ${_param:openstack_compute_node01_control_address}
           names:
-          - ${_param:openstack_compute_node01_hostname}
-          - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_compute_node01_hostname}
+            - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
         cmp002:
           address: ${_param:openstack_compute_node02_control_address}
           names:
-          - ${_param:openstack_compute_node02_hostname}
-          - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
-#        gtw01:
-#          address: ${_param:openstack_gateway_node01_address}
-#          names:
-#          - ${_param:openstack_gateway_node01_hostname}
-#          - ${_param:openstack_gateway_node01_hostname}.${_param:cluster_domain}
-#        gtw02:
-#          address: ${_param:openstack_gateway_node02_address}
-#          names:
-#          - ${_param:openstack_gateway_node02_hostname}
-#          - ${_param:openstack_gateway_node02_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_compute_node02_hostname}
+            - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
+        # gtw01:
+        #   address: ${_param:openstack_gateway_node01_address}
+        #   names:
+        #   - ${_param:openstack_gateway_node01_hostname}
+        #   - ${_param:openstack_gateway_node01_hostname}.${_param:cluster_domain}
+        # gtw02:
+        #   address: ${_param:openstack_gateway_node02_address}
+        #   names:
+        #   - ${_param:openstack_gateway_node02_hostname}
+        #   - ${_param:openstack_gateway_node02_hostname}.${_param:cluster_domain}
         odl01:
           address: ${_param:opendaylight_service_host}
           names:
-          - ${_param:opendaylight_server_node01_hostname}
-          - ${_param:opendaylight_server_node01_hostname}.${_param:cluster_domain}
+            - ${_param:opendaylight_server_node01_hostname}
+            - ${_param:opendaylight_server_node01_hostname}.${_param:cluster_domain}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml
index f5312c1da..3c6427ca0 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/message_queue.yml
@@ -1,10 +1,11 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.rabbitmq.server.cluster
-- system.rabbitmq.server.vhost.openstack
-- cluster.baremetal-mcp-ocata-odl-ha
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - system.rabbitmq.server.cluster
+  - system.rabbitmq.server.vhost.openstack
+  - cluster.baremetal-mcp-ocata-odl-ha
 parameters:
   _param:
     keepalived_vip_interface: ens3
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
index 89a193061..446157d41 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/proxy.yml
@@ -1,20 +1,21 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.nginx.server.single
-- system.nginx.server.proxy.openstack_api
-- system.nginx.server.proxy.openstack_vnc
-- system.nginx.server.proxy.openstack_web
-- system.nginx.server.proxy.openstack.aodh
-- system.nginx.server.proxy.openstack.ceilometer
-- system.horizon.server.single
-- system.salt.minion.cert.proxy
-- system.sphinx.server.doc.reclass
-- service.keepalived.cluster.single
-- cluster.baremetal-mcp-ocata-odl-ha.infra
-- cluster.baremetal-mcp-ocata-odl-ha.openstack.dashboard
-# - cluster.baremetal-mcp-ocata-odl-ha.stacklight.proxy
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - system.nginx.server.single
+  - system.nginx.server.proxy.openstack_api
+  - system.nginx.server.proxy.openstack_vnc
+  - system.nginx.server.proxy.openstack_web
+  - system.nginx.server.proxy.openstack.aodh
+  - system.nginx.server.proxy.openstack.ceilometer
+  - system.horizon.server.single
+  - system.salt.minion.cert.proxy
+  - system.sphinx.server.doc.reclass
+  - service.keepalived.cluster.single
+  - cluster.baremetal-mcp-ocata-odl-ha.infra
+  - cluster.baremetal-mcp-ocata-odl-ha.openstack.dashboard
+  # - cluster.baremetal-mcp-ocata-odl-ha.stacklight.proxy
 parameters:
   _param:
     keepalived_vip_interface: ens3
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
index 4e900908b..e1c969cf1 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-odl-ha/openstack/telemetry.yml
@@ -1,15 +1,16 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.mongodb.server.cluster
-- system.mongodb.server.database.ceilometer
-- system.ceilometer.server.backend.mongodb
-# - system.ceilometer.server.backend.influxdb
-# - system.heka.ceilometer_collector.single
-- system.ceilometer.server.cluster
-- system.aodh.server.cluster
-- cluster.baremetal-mcp-ocata-odl-ha.infra
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - system.mongodb.server.cluster
+  - system.mongodb.server.database.ceilometer
+  - system.ceilometer.server.backend.mongodb
+  # - system.ceilometer.server.backend.influxdb
+  # - system.heka.ceilometer_collector.single
+  - system.ceilometer.server.cluster
+  - system.aodh.server.cluster
+  - cluster.baremetal-mcp-ocata-odl-ha.infra
 parameters:
   _param:
     keepalived_openstack_telemetry_vip_interface: ens3
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
index 5ac2277dd..ca38c2823 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/config.yml
@@ -1,23 +1,24 @@
+---
 classes:
-- service.git.client
-- system.linux.system.single
-- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.saltstack.xenial
-- system.salt.master.api
-- system.salt.master.pkg
-- system.salt.minion.ca.salt_master
-- system.reclass.storage.salt
-- system.reclass.storage.system.physical_control_cluster
-- system.reclass.storage.system.openstack_control_cluster
-- system.reclass.storage.system.openstack_proxy_cluster
-- system.reclass.storage.system.openstack_database_cluster
-- system.reclass.storage.system.openstack_message_queue_cluster
-- system.reclass.storage.system.openstack_telemetry_cluster
-# - system.reclass.storage.system.stacklight_log_cluster
-# - system.reclass.storage.system.stacklight_monitor_cluster
-# - system.reclass.storage.system.stacklight_telemetry_cluster
-- system.reclass.storage.system.infra_maas_single
-- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
+  - service.git.client
+  - system.linux.system.single
+  - system.linux.system.repo.mcp.salt
+  - system.linux.system.repo.saltstack.xenial
+  - system.salt.master.api
+  - system.salt.master.pkg
+  - system.salt.minion.ca.salt_master
+  - system.reclass.storage.salt
+  - system.reclass.storage.system.physical_control_cluster
+  - system.reclass.storage.system.openstack_control_cluster
+  - system.reclass.storage.system.openstack_proxy_cluster
+  - system.reclass.storage.system.openstack_database_cluster
+  - system.reclass.storage.system.openstack_message_queue_cluster
+  - system.reclass.storage.system.openstack_telemetry_cluster
+  # - system.reclass.storage.system.stacklight_log_cluster
+  # - system.reclass.storage.system.stacklight_monitor_cluster
+  # - system.reclass.storage.system.stacklight_telemetry_cluster
+  - system.reclass.storage.system.infra_maas_single
+  - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
 parameters:
   _param:
     salt_master_base_environment: prd
@@ -28,6 +29,7 @@ parameters:
     single_address: ${_param:infra_config_address}
     deploy_address: ${_param:infra_config_deploy_address}
     salt_master_host: ${_param:infra_config_deploy_address}
+    # yamllint disable rule:line-length
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
   linux:
     network:
@@ -79,16 +81,16 @@ parameters:
         openstack_proxy_node02:
           params:
             linux_system_codename: xenial
-#        stacklight_log_node01:
-#          classes:
-#          - system.elasticsearch.client.single
-#        stacklight_monitor_node01:
-#          classes:
-#          - system.grafana.client.single
-#          - system.kibana.client.single
+        # stacklight_log_node01:
+        #   classes:
+        #   - system.elasticsearch.client.single
+        # stacklight_monitor_node01:
+        #   classes:
+        #   - system.grafana.client.single
+        #   - system.kibana.client.single
         openstack_control_node01:
           classes:
-          - cluster.${_param:cluster_name}.openstack.control_init
+            - cluster.${_param:cluster_name}.openstack.control_init
           params:
             linux_system_codename: xenial
         openstack_control_node02:
@@ -99,7 +101,7 @@ parameters:
             linux_system_codename: xenial
         openstack_database_node01:
           classes:
-          - cluster.${_param:cluster_name}.openstack.database_init
+            - cluster.${_param:cluster_name}.openstack.database_init
           params:
             linux_system_codename: xenial
         openstack_database_node02:
@@ -112,7 +114,7 @@ parameters:
           name: ${_param:openstack_compute_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.openstack.compute
+            - cluster.${_param:cluster_name}.openstack.compute
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: xenial
@@ -126,7 +128,7 @@ parameters:
           name: ${_param:openstack_compute_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.openstack.compute
+            - cluster.${_param:cluster_name}.openstack.compute
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: xenial
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml
index 60b615b11..ce3d74d0d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/init.yml
@@ -1,16 +1,17 @@
+---
 classes:
-- system.linux.system.single
-- cluster.all-mcp-ocata-common
-- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack
-# - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.stacklight
-# - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.stacklight.client
+  - system.linux.system.single
+  - cluster.all-mcp-ocata-common
+  - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack
+  # - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.stacklight
+  # - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.stacklight.client
 parameters:
   _param:
     apt_mk_version: nightly
     mcp_repo_version: 1.1
     cluster_name: baremetal-mcp-ocata-ovs-dpdk-ha
     cluster_domain: ${_param:cluster_name}.local
-#    stacklight_environment: ${_param:cluster_domain}
+    # stacklight_environment: ${_param:cluster_domain}
     reclass_data_revision: master
     cluster_public_host: ${_param:openstack_proxy_address}
     infra_config_hostname: cfg01
@@ -54,6 +55,7 @@ parameters:
       address: ${_param:single_address}
       netmask: 255.255.255.0
 
+    # yamllint disable-line rule:line-length
     salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
   linux:
     system:
@@ -70,30 +72,30 @@ parameters:
         cfg01:
           address: ${_param:infra_config_address}
           names:
-          - cfg01
-          - cfg01.${_param:cluster_domain}
+            - cfg01
+            - cfg01.${_param:cluster_domain}
         cfg:
           address: ${_param:infra_config_address}
           names:
-          - ${_param:infra_config_hostname}
-          - ${_param:infra_config_hostname}.${_param:cluster_domain}
+            - ${_param:infra_config_hostname}
+            - ${_param:infra_config_hostname}.${_param:cluster_domain}
         mas01:
           address: ${_param:infra_maas_node01_address}
           names:
-          - ${_param:infra_maas_node01_hostname}
-          - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain}
+            - ${_param:infra_maas_node01_hostname}
+            - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain}
         kvm01:
           address: ${_param:infra_kvm_node01_address}
           names:
-          - ${_param:infra_kvm_node01_hostname}
-          - ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+            - ${_param:infra_kvm_node01_hostname}
+            - ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
         kvm02:
           address: ${_param:infra_kvm_node02_address}
           names:
-          - ${_param:infra_kvm_node02_hostname}
-          - ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+            - ${_param:infra_kvm_node02_hostname}
+            - ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
         kvm03:
           address: ${_param:infra_kvm_node03_address}
           names:
-          - ${_param:infra_kvm_node03_hostname}
-          - ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+            - ${_param:infra_kvm_node03_hostname}
+            - ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
index 266f2ba65..05cd09737 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/kvm.yml
@@ -1,21 +1,22 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- service.keepalived.cluster.single
-- system.glusterfs.server.volume.glance
-- system.glusterfs.server.volume.keystone
-- system.glusterfs.server.cluster
-- system.salt.control.virt
-- system.salt.control.cluster.openstack_control_cluster
-- system.salt.control.cluster.openstack_proxy_cluster
-- system.salt.control.cluster.openstack_database_cluster
-- system.salt.control.cluster.openstack_message_queue_cluster
-- system.salt.control.cluster.openstack_telemetry_cluster
-# - system.salt.control.cluster.stacklight_server_cluster
-# - system.salt.control.cluster.stacklight_log_cluster
-# - system.salt.control.cluster.stacklight_telemetry_cluster
-- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - service.keepalived.cluster.single
+  - system.glusterfs.server.volume.glance
+  - system.glusterfs.server.volume.keystone
+  - system.glusterfs.server.cluster
+  - system.salt.control.virt
+  - system.salt.control.cluster.openstack_control_cluster
+  - system.salt.control.cluster.openstack_proxy_cluster
+  - system.salt.control.cluster.openstack_database_cluster
+  - system.salt.control.cluster.openstack_message_queue_cluster
+  - system.salt.control.cluster.openstack_telemetry_cluster
+  # - system.salt.control.cluster.stacklight_server_cluster
+  # - system.salt.control.cluster.stacklight_log_cluster
+  # - system.salt.control.cluster.stacklight_telemetry_cluster
+  - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
 parameters:
   _param:
     linux_system_codename: xenial
@@ -28,8 +29,8 @@ parameters:
     deploy_nic: enp6s0
   salt:
     control:
-      size: #RAM 4096,8192,16384,32768,65536
-      ##Default production sizing
+      size:  # RAM 4096,8192,16384,32768,65536
+        # Default production sizing
         openstack.control:
           cpu: 4
           ram: 12288
@@ -55,21 +56,21 @@ parameters:
           ram: 2048
           disk_profile: small
           net_profile: default
-#        stacklight.log:
-#          cpu: 2
-#          ram: 4096
-#          disk_profile: xxlarge
-#          net_profile: default
-#        stacklight.server:
-#          cpu: 2
-#          ram: 4096
-#          disk_profile: small
-#          net_profile: default
-#        stacklight.telemetry:
-#          cpu: 2
-#          ram: 4096
-#          disk_profile: xxlarge
-#          net_profile: default
+          # stacklight.log:
+          #   cpu: 2
+          #   ram: 4096
+          #   disk_profile: xxlarge
+          #   net_profile: default
+          # stacklight.server:
+          #   cpu: 2
+          #   ram: 4096
+          #   disk_profile: small
+          #   net_profile: default
+          # stacklight.telemetry:
+          #   cpu: 2
+          #   ram: 4096
+          #   disk_profile: xxlarge
+          #   net_profile: default
       cluster:
         internal:
           node:
@@ -121,9 +122,9 @@ parameters:
             - ${_param:cluster_node02_address}:/srv/glusterfs/nova_instances
             - ${_param:cluster_node03_address}:/srv/glusterfs/nova_instances
           options:
-            cluster.readdir-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
+            cluster.readdir-optimize: 'On'
+            nfs.disable: 'On'
+            network.remote-dio: 'On'
             diagnostics.client-log-level: WARNING
             diagnostics.brick-log-level: WARNING
   linux:
@@ -142,10 +143,10 @@ parameters:
           proto: dhcp
           type: bridge
           name_servers:
-          - 8.8.8.8
-          - 8.8.4.4
+            - 8.8.8.8
+            - 8.8.4.4
           use_interfaces:
-          - ${_param:deploy_nic}
+            - ${_param:deploy_nic}
           noifupdown: true
         vlan300:
           enabled: true
@@ -153,7 +154,7 @@ parameters:
           type: vlan
           name: ${_param:deploy_nic}.300
           use_interfaces:
-          - ${_param:deploy_nic}
+            - ${_param:deploy_nic}
         br-ctl:
           enabled: true
           type: bridge
@@ -161,4 +162,4 @@ parameters:
           address: ${_param:single_address}
           netmask: 255.255.255.0
           use_interfaces:
-          - ${_param:deploy_nic}.300
+            - ${_param:deploy_nic}.300
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
index 3f08290f8..4e9ed2fb9 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/infra/maas.yml
@@ -1,7 +1,8 @@
+---
 classes:
-- system.linux.system.repo.saltstack.xenial
-- system.maas.region.single
-- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
+  - system.linux.system.repo.saltstack.xenial
+  - system.maas.region.single
+  - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
 parameters:
   _param:
     dhcp_interface: ens3
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml
index 1b839fb19..b282a8f43 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/init.yml
@@ -1,4 +1,5 @@
+---
 classes:
-- cluster.all-mcp-ocata-common
-- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
-- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack
+  - cluster.all-mcp-ocata-common
+  - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
+  - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml
index 9233d6a34..54fe3d793 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/benchmark.yml
@@ -1,5 +1,6 @@
+---
 classes:
-- cluster.baremetal-mcp-ocata-ovs-dpdk-ha
+  - cluster.baremetal-mcp-ocata-ovs-dpdk-ha
 parameters:
   linux:
     network:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
index 126751c4b..41b9984a0 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/compute.yml
@@ -1,18 +1,19 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.linux.storage.loopback
-- system.glusterfs.client.cluster
-- system.nova.compute.cluster
-- system.nova.compute.nfv.hugepages
-- system.nova.compute.nfv.cpu_pinning
-- system.neutron.compute.nfv.dpdk
-- system.neutron.gateway.cluster
-- system.cinder.volume.single
-- system.cinder.volume.backend.lvm
-- system.ceilometer.agent.cluster
-- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - system.linux.storage.loopback
+  - system.glusterfs.client.cluster
+  - system.nova.compute.cluster
+  - system.nova.compute.nfv.hugepages
+  - system.nova.compute.nfv.cpu_pinning
+  - system.neutron.compute.nfv.dpdk
+  - system.neutron.gateway.cluster
+  - system.cinder.volume.single
+  - system.cinder.volume.backend.lvm
+  - system.ceilometer.agent.cluster
+  - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
 parameters:
   _param:
     cluster_vip_address: ${_param:openstack_control_address}
@@ -33,7 +34,7 @@ parameters:
     loopback_device_size: 20
   neutron:
     gateway:
-      dpdk: True
+      dpdk: 'True'
       backend:
         tenant_vlan_range: ${_param:neutron_tenant_vlan_range}
   nova:
@@ -48,6 +49,7 @@ parameters:
           server: ${_param:glusterfs_service_host}
           user: nova
           group: nova
+          # yamllint disable-line rule:line-length
           opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}"
   linux:
     system:
@@ -57,6 +59,7 @@ parameters:
           vm.dirty_background_ratio: 5
       repo:
         uca:
+          # yamllint disable-line rule:line-length
           source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
           architectures: amd64
           key_id: EC4926EA
@@ -81,7 +84,7 @@ parameters:
           type: vlan
           name: ${_param:mgmt_nic}.300
           use_interfaces:
-          - ${_param:mgmt_nic}
+            - ${_param:mgmt_nic}
         br-ctl:
           enabled: true
           type: bridge
@@ -89,7 +92,7 @@ parameters:
           address: ${_param:single_address}
           netmask: 255.255.255.0
           use_interfaces:
-          - ${_param:mgmt_nic}.300
+            - ${_param:mgmt_nic}.300
         br-floating:
           enabled: true
           type: ovs_bridge
@@ -106,9 +109,9 @@ parameters:
           address: ${_param:external_address}
           netmask: 255.255.255.0
           use_interfaces:
-          - ${_param:external_nic}
+            - ${_param:external_nic}
           use_ovs_ports:
-          - float-to-ex
+            - float-to-ex
         dpdk0:
           name: ${_param:dpdk0_name}
           pci: ${_param:dpdk0_pci}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml
index 7e8ea312f..fb9f54e03 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control.yml
@@ -1,26 +1,27 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.ceilometer.client
-- system.memcached.server.single
-- system.keystone.server.cluster
-- system.keystone.server.wsgi
-- system.glance.control.cluster
-- system.neutron.control.openvswitch.cluster
-- system.nova.control.cluster
-- system.cinder.control.cluster
-- system.cinder.control.backend.lvm
-- system.heat.server.cluster
-- system.designate.server.cluster
-- system.designate.server.backend.bind
-- system.bind.server.single
-- system.haproxy.proxy.listen.openstack.nova-placement
-- system.haproxy.proxy.listen.openstack.glare
-- system.glusterfs.client.cluster
-- system.glusterfs.client.volume.glance
-- system.glusterfs.client.volume.keystone
-- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - system.ceilometer.client
+  - system.memcached.server.single
+  - system.keystone.server.cluster
+  - system.keystone.server.wsgi
+  - system.glance.control.cluster
+  - system.neutron.control.openvswitch.cluster
+  - system.nova.control.cluster
+  - system.cinder.control.cluster
+  - system.cinder.control.backend.lvm
+  - system.heat.server.cluster
+  - system.designate.server.cluster
+  - system.designate.server.backend.bind
+  - system.bind.server.single
+  - system.haproxy.proxy.listen.openstack.nova-placement
+  - system.haproxy.proxy.listen.openstack.glare
+  - system.glusterfs.client.cluster
+  - system.glusterfs.client.volume.glance
+  - system.glusterfs.client.volume.keystone
+  - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
 parameters:
   _param:
     keepalived_vip_interface: ens3
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control_init.yml
index e759c0c8d..79c387940 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control_init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/control_init.yml
@@ -1,9 +1,10 @@
+---
 classes:
-- system.keystone.client.single
-- system.keystone.client.service.aodh
-- system.keystone.client.service.ceilometer
-- system.keystone.client.service.nova21
-- system.keystone.client.service.nova-placement
-- system.keystone.client.service.glare
-- system.keystone.client.service.cinder3
-- system.keystone.client.service.designate
+  - system.keystone.client.single
+  - system.keystone.client.service.aodh
+  - system.keystone.client.service.ceilometer
+  - system.keystone.client.service.nova21
+  - system.keystone.client.service.nova-placement
+  - system.keystone.client.service.glare
+  - system.keystone.client.service.cinder3
+  - system.keystone.client.service.designate
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml
index 3b0514fbe..9e44d62b1 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/dashboard.yml
@@ -1,6 +1,7 @@
+---
 classes:
-- system.horizon.server.single
-- cluster.baremetal-mcp-ocata-ovs-dpdk-ha
+  - system.horizon.server.single
+  - cluster.baremetal-mcp-ocata-ovs-dpdk-ha
 parameters:
   _param:
     horizon_site_branding: OpenStack Dashboard
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml
index b0b462ad8..c7d81c85e 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database.yml
@@ -1,19 +1,20 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.galera.server.cluster
-- system.galera.server.database.aodh
-- system.galera.server.database.ceilometer
-- system.galera.server.database.cinder
-- system.galera.server.database.designate
-- system.galera.server.database.glance
-- system.galera.server.database.grafana
-- system.galera.server.database.heat
-- system.galera.server.database.keystone
-- system.galera.server.database.nova
-- system.galera.server.database.neutron
-- cluster.baremetal-mcp-ocata-ovs-dpdk-ha
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - system.galera.server.cluster
+  - system.galera.server.database.aodh
+  - system.galera.server.database.ceilometer
+  - system.galera.server.database.cinder
+  - system.galera.server.database.designate
+  - system.galera.server.database.glance
+  - system.galera.server.database.grafana
+  - system.galera.server.database.heat
+  - system.galera.server.database.keystone
+  - system.galera.server.database.nova
+  - system.galera.server.database.neutron
+  - cluster.baremetal-mcp-ocata-ovs-dpdk-ha
 parameters:
   _param:
     keepalived_vip_interface: ens3
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database_init.yml
index b16f05593..5dcb9c9e1 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database_init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/database_init.yml
@@ -1,2 +1,3 @@
+---
 classes:
-- system.mysql.client.single
+  - system.mysql.client.single
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
index a4e4e1ab7..cfc3688b4 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/init.yml
@@ -1,3 +1,4 @@
+---
 parameters:
   _param:
 
@@ -77,17 +78,17 @@ parameters:
 
     openstack_region: RegionOne
     admin_email: root@localhost
-    ##Neutron osv/nodvr
-    neutron_control_dvr: False
+    # Neutron osv/nodvr
+    neutron_control_dvr: 'False'
     neutron_tenant_network_types: "flat,vlan"
-    neutron_l3_ha: True
+    neutron_l3_ha: 'True'
     neutron_global_physnet_mtu: 1500
     neutron_external_mtu: 1500
-    neutron_gateway_dvr: False
+    neutron_gateway_dvr: 'False'
     neutron_gateway_agent_mode: legacy
-    neutron_compute_dvr: False
+    neutron_compute_dvr: 'False'
     neutron_compute_agent_mode: legacy
-    neutron_compute_external_access: True
+    neutron_compute_external_access: 'True'
     galera_server_cluster_name: openstack_cluster
     galera_server_maintenance_password: opnfv_secret
     galera_server_admin_password: opnfv_secret
@@ -148,6 +149,7 @@ parameters:
     keystone_designate_password: opnfv_secret
     ceilometer_secret_key: opnfv_secret
     horizon_version: ${_param:openstack_version}
+    # yamllint disable rule:line-length
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
     horizon_identity_host: ${_param:openstack_control_address}
     horizon_identity_encryption: none
@@ -188,14 +190,14 @@ parameters:
       rndc_key_file: /etc/designate/rndc.key
     designate_version: ${_param:openstack_version}
     # Billing
-    #keystone_billometer_password: opnfv_secret
-    #keystone_billometer_address: ${_param:billometer_service_host}
-    #billometer_service_host: ${_param:openstack_billing_address}
-    #billometer_version: ${_param:openstack_version}
-    #billometer_secret_key: opnfv_secretpasswordpasswordpassword
-    #billometer_identity_password: ${_param:keystone_billometer_password}
-    #billometer_identity_host: ${_param:openstack_control_address}
-    #billometer_identity_token: ${_param:keystone_service_token}
+    # keystone_billometer_password: opnfv_secret
+    # keystone_billometer_address: ${_param:billometer_service_host}
+    # billometer_service_host: ${_param:openstack_billing_address}
+    # billometer_version: ${_param:openstack_version}
+    # billometer_secret_key: opnfv_secretpasswordpasswordpassword
+    # billometer_identity_password: ${_param:keystone_billometer_password}
+    # billometer_identity_host: ${_param:openstack_control_address}
+    # billometer_identity_token: ${_param:keystone_service_token}
   linux:
     system:
       repo:
@@ -214,108 +216,108 @@ parameters:
         prx:
           address: ${_param:openstack_proxy_address}
           names:
-          - ${_param:openstack_proxy_hostname}
-          - ${_param:openstack_proxy_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_proxy_hostname}
+            - ${_param:openstack_proxy_hostname}.${_param:cluster_domain}
         prx01:
           address: ${_param:openstack_proxy_node01_address}
           names:
-          - ${_param:openstack_proxy_node01_hostname}
-          - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_proxy_node01_hostname}
+            - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain}
         prx02:
           address: ${_param:openstack_proxy_node02_address}
           names:
-          - ${_param:openstack_proxy_node02_hostname}
-          - ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_proxy_node02_hostname}
+            - ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain}
         ctl:
           address: ${_param:openstack_control_address}
           names:
-          - ${_param:openstack_control_hostname}
-          - ${_param:openstack_control_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_control_hostname}
+            - ${_param:openstack_control_hostname}.${_param:cluster_domain}
         ctl01:
           address: ${_param:openstack_control_node01_address}
           names:
-          - ${_param:openstack_control_node01_hostname}
-          - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_control_node01_hostname}
+            - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
         ctl02:
           address: ${_param:openstack_control_node02_address}
           names:
-          - ${_param:openstack_control_node02_hostname}
-          - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_control_node02_hostname}
+            - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
         ctl03:
           address: ${_param:openstack_control_node03_address}
           names:
-          - ${_param:openstack_control_node03_hostname}
-          - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_control_node03_hostname}
+            - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
         msg:
           address: ${_param:openstack_message_queue_address}
           names:
-          - ${_param:openstack_message_queue_hostname}
-          - ${_param:openstack_message_queue_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_message_queue_hostname}
+            - ${_param:openstack_message_queue_hostname}.${_param:cluster_domain}
         msg01:
           address: ${_param:openstack_message_queue_node01_address}
           names:
-          - ${_param:openstack_message_queue_node01_hostname}
-          - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_message_queue_node01_hostname}
+            - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain}
         msg02:
           address: ${_param:openstack_message_queue_node02_address}
           names:
-          - ${_param:openstack_message_queue_node02_hostname}
-          - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_message_queue_node02_hostname}
+            - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain}
         msg03:
           address: ${_param:openstack_message_queue_node03_address}
           names:
-          - ${_param:openstack_message_queue_node03_hostname}
-          - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_message_queue_node03_hostname}
+            - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain}
         dbs:
           address: ${_param:openstack_database_address}
           names:
-          - ${_param:openstack_database_hostname}
-          - ${_param:openstack_database_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_database_hostname}
+            - ${_param:openstack_database_hostname}.${_param:cluster_domain}
         dbs01:
           address: ${_param:openstack_database_node01_address}
           names:
-          - ${_param:openstack_database_node01_hostname}
-          - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_database_node01_hostname}
+            - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain}
         dbs02:
           address: ${_param:openstack_database_node02_address}
           names:
-          - ${_param:openstack_database_node02_hostname}
-          - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_database_node02_hostname}
+            - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain}
         dbs03:
           address: ${_param:openstack_database_node03_address}
           names:
-          - ${_param:openstack_database_node03_hostname}
-          - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_database_node03_hostname}
+            - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain}
         mdb:
           address: ${_param:openstack_telemetry_address}
           names:
-          - ${_param:openstack_telemetry_hostname}
-          - ${_param:openstack_telemetry_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_telemetry_hostname}
+            - ${_param:openstack_telemetry_hostname}.${_param:cluster_domain}
         mdb01:
           address: ${_param:openstack_telemetry_node01_address}
           names:
-          - ${_param:openstack_telemetry_node01_hostname}
-          - ${_param:openstack_telemetry_node01_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_telemetry_node01_hostname}
+            - ${_param:openstack_telemetry_node01_hostname}.${_param:cluster_domain}
         mdb02:
           address: ${_param:openstack_telemetry_node02_address}
           names:
-          - ${_param:openstack_telemetry_node02_hostname}
-          - ${_param:openstack_telemetry_node02_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_telemetry_node02_hostname}
+            - ${_param:openstack_telemetry_node02_hostname}.${_param:cluster_domain}
         mdb03:
           address: ${_param:openstack_telemetry_node03_address}
           names:
-          - ${_param:openstack_telemetry_node03_hostname}
-          - ${_param:openstack_telemetry_node03_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_telemetry_node03_hostname}
+            - ${_param:openstack_telemetry_node03_hostname}.${_param:cluster_domain}
         cmp001:
           address: ${_param:openstack_compute_node01_control_address}
           names:
-          - ${_param:openstack_compute_node01_hostname}
-          - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_compute_node01_hostname}
+            - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
         cmp002:
           address: ${_param:openstack_compute_node02_control_address}
           names:
-          - ${_param:openstack_compute_node02_hostname}
-          - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_compute_node02_hostname}
+            - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
 #        gtw01:
 #          address: ${_param:openstack_gateway_node01_address}
 #          names:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml
index 90a9d1377..d9215c53f 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/message_queue.yml
@@ -1,10 +1,11 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.rabbitmq.server.cluster
-- system.rabbitmq.server.vhost.openstack
-- cluster.baremetal-mcp-ocata-ovs-dpdk-ha
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - system.rabbitmq.server.cluster
+  - system.rabbitmq.server.vhost.openstack
+  - cluster.baremetal-mcp-ocata-ovs-dpdk-ha
 parameters:
   _param:
     keepalived_vip_interface: ens3
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
index c85909fc3..11f0e05a4 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/proxy.yml
@@ -1,19 +1,20 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.nginx.server.single
-- system.nginx.server.proxy.openstack_api
-- system.nginx.server.proxy.openstack_vnc
-- system.nginx.server.proxy.openstack_web
-- system.nginx.server.proxy.openstack.aodh
-- system.nginx.server.proxy.openstack.ceilometer
-- system.horizon.server.single
-- system.salt.minion.cert.proxy
-- system.sphinx.server.doc.reclass
-- service.keepalived.cluster.single
-- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
-- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack.dashboard
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - system.nginx.server.single
+  - system.nginx.server.proxy.openstack_api
+  - system.nginx.server.proxy.openstack_vnc
+  - system.nginx.server.proxy.openstack_web
+  - system.nginx.server.proxy.openstack.aodh
+  - system.nginx.server.proxy.openstack.ceilometer
+  - system.horizon.server.single
+  - system.salt.minion.cert.proxy
+  - system.sphinx.server.doc.reclass
+  - service.keepalived.cluster.single
+  - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
+  - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.openstack.dashboard
 # - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.stacklight.proxy
 parameters:
   _param:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml
index b2e49cb7e..28a27b076 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-dpdk-ha/openstack/telemetry.yml
@@ -1,15 +1,16 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.mongodb.server.cluster
-- system.mongodb.server.database.ceilometer
-- system.ceilometer.server.backend.mongodb
-# - system.ceilometer.server.backend.influxdb
-# - system.heka.ceilometer_collector.single
-- system.ceilometer.server.cluster
-- system.aodh.server.cluster
-- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - system.mongodb.server.cluster
+  - system.mongodb.server.database.ceilometer
+  - system.ceilometer.server.backend.mongodb
+  # - system.ceilometer.server.backend.influxdb
+  # - system.heka.ceilometer_collector.single
+  - system.ceilometer.server.cluster
+  - system.aodh.server.cluster
+  - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra
 parameters:
   _param:
     keepalived_openstack_telemetry_vip_interface: ens3
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
index 452062191..3966dae6c 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/config.yml
@@ -1,23 +1,24 @@
+---
 classes:
-- service.git.client
-- system.linux.system.single
-- system.linux.system.repo.mcp.salt
-- system.linux.system.repo.saltstack.xenial
-- system.salt.master.api
-- system.salt.master.pkg
-- system.salt.minion.ca.salt_master
-- system.reclass.storage.salt
-- system.reclass.storage.system.physical_control_cluster
-- system.reclass.storage.system.openstack_control_cluster
-- system.reclass.storage.system.openstack_proxy_cluster
-- system.reclass.storage.system.openstack_database_cluster
-- system.reclass.storage.system.openstack_message_queue_cluster
-- system.reclass.storage.system.openstack_telemetry_cluster
-# - system.reclass.storage.system.stacklight_log_cluster
-# - system.reclass.storage.system.stacklight_monitor_cluster
-# - system.reclass.storage.system.stacklight_telemetry_cluster
-- system.reclass.storage.system.infra_maas_single
-- cluster.baremetal-mcp-ocata-ovs-ha.infra
+  - service.git.client
+  - system.linux.system.single
+  - system.linux.system.repo.mcp.salt
+  - system.linux.system.repo.saltstack.xenial
+  - system.salt.master.api
+  - system.salt.master.pkg
+  - system.salt.minion.ca.salt_master
+  - system.reclass.storage.salt
+  - system.reclass.storage.system.physical_control_cluster
+  - system.reclass.storage.system.openstack_control_cluster
+  - system.reclass.storage.system.openstack_proxy_cluster
+  - system.reclass.storage.system.openstack_database_cluster
+  - system.reclass.storage.system.openstack_message_queue_cluster
+  - system.reclass.storage.system.openstack_telemetry_cluster
+  # - system.reclass.storage.system.stacklight_log_cluster
+  # - system.reclass.storage.system.stacklight_monitor_cluster
+  # - system.reclass.storage.system.stacklight_telemetry_cluster
+  - system.reclass.storage.system.infra_maas_single
+  - cluster.baremetal-mcp-ocata-ovs-ha.infra
 parameters:
   _param:
     salt_master_base_environment: prd
@@ -27,6 +28,7 @@ parameters:
     single_address: ${_param:infra_config_address}
     deploy_address: ${_param:infra_config_deploy_address}
     salt_master_host: ${_param:infra_config_deploy_address}
+    # yamllint disable rule:line-length
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
   linux:
     network:
@@ -78,16 +80,16 @@ parameters:
         openstack_proxy_node02:
           params:
             linux_system_codename: xenial
-#        stacklight_log_node01:
-#          classes:
-#          - system.elasticsearch.client.single
-#        stacklight_monitor_node01:
-#          classes:
-#          - system.grafana.client.single
-#          - system.kibana.client.single
+        # stacklight_log_node01:
+        #   classes:
+        #     - system.elasticsearch.client.single
+        # stacklight_monitor_node01:
+        #   classes:
+        #     - system.grafana.client.single
+        #     - system.kibana.client.single
         openstack_control_node01:
           classes:
-          - cluster.${_param:cluster_name}.openstack.control_init
+            - cluster.${_param:cluster_name}.openstack.control_init
           params:
             linux_system_codename: xenial
         openstack_control_node02:
@@ -98,7 +100,7 @@ parameters:
             linux_system_codename: xenial
         openstack_database_node01:
           classes:
-          - cluster.${_param:cluster_name}.openstack.database_init
+            - cluster.${_param:cluster_name}.openstack.database_init
           params:
             linux_system_codename: xenial
         openstack_database_node02:
@@ -111,7 +113,7 @@ parameters:
           name: ${_param:openstack_compute_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.openstack.compute
+            - cluster.${_param:cluster_name}.openstack.compute
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: xenial
@@ -123,7 +125,7 @@ parameters:
           name: ${_param:openstack_compute_node02_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.openstack.compute
+            - cluster.${_param:cluster_name}.openstack.compute
           params:
             salt_master_host: ${_param:reclass_config_master}
             linux_system_codename: xenial
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
index efb288e77..b4cc054a2 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/init.yml
@@ -1,16 +1,17 @@
+---
 classes:
-- system.linux.system.single
-- cluster.all-mcp-ocata-common
-- cluster.baremetal-mcp-ocata-ovs-ha.openstack
-# - cluster.baremetal-mcp-ocata-ovs-ha.stacklight
-# - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.client
+  - system.linux.system.single
+  - cluster.all-mcp-ocata-common
+  - cluster.baremetal-mcp-ocata-ovs-ha.openstack
+  # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight
+  # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.client
 parameters:
   _param:
     apt_mk_version: nightly
     mcp_repo_version: 1.1
     cluster_name: baremetal-mcp-ocata-ovs-ha
     cluster_domain: ${_param:cluster_name}.local
-#    stacklight_environment: ${_param:cluster_domain}
+    # stacklight_environment: ${_param:cluster_domain}
     reclass_data_revision: master
     cluster_public_host: ${_param:openstack_proxy_address}
     infra_config_hostname: cfg01
@@ -54,6 +55,7 @@ parameters:
       address: ${_param:single_address}
       netmask: 255.255.255.0
 
+    # yamllint disable-line rule:line-length
     salt_api_password_hash: "$6$WV0P1shnoDh2gI/Z$22/Bcd7ffMv0jDlFpT63cAU4PiXHz9pjXwngToKwqAsgoeK4HNR3PiKaushjxp3JsQ8hNoJmAC6TxzVqfV8WH/"
   linux:
     system:
@@ -67,30 +69,30 @@ parameters:
         cfg01:
           address: ${_param:infra_config_address}
           names:
-          - cfg01
-          - cfg01.${_param:cluster_domain}
+            - cfg01
+            - cfg01.${_param:cluster_domain}
         cfg:
           address: ${_param:infra_config_address}
           names:
-          - ${_param:infra_config_hostname}
-          - ${_param:infra_config_hostname}.${_param:cluster_domain}
+            - ${_param:infra_config_hostname}
+            - ${_param:infra_config_hostname}.${_param:cluster_domain}
         mas01:
           address: ${_param:infra_maas_node01_address}
           names:
-          - ${_param:infra_maas_node01_hostname}
-          - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain}
+            - ${_param:infra_maas_node01_hostname}
+            - ${_param:infra_maas_node01_hostname}.${_param:cluster_domain}
         kvm01:
           address: ${_param:infra_kvm_node01_address}
           names:
-          - ${_param:infra_kvm_node01_hostname}
-          - ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
+            - ${_param:infra_kvm_node01_hostname}
+            - ${_param:infra_kvm_node01_hostname}.${_param:cluster_domain}
         kvm02:
           address: ${_param:infra_kvm_node02_address}
           names:
-          - ${_param:infra_kvm_node02_hostname}
-          - ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
+            - ${_param:infra_kvm_node02_hostname}
+            - ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
         kvm03:
           address: ${_param:infra_kvm_node03_address}
           names:
-          - ${_param:infra_kvm_node03_hostname}
-          - ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
+            - ${_param:infra_kvm_node03_hostname}
+            - ${_param:infra_kvm_node03_hostname}.${_param:cluster_domain}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
index 3e9879b43..9e023e33d 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/kvm.yml
@@ -1,21 +1,22 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- service.keepalived.cluster.single
-- system.glusterfs.server.volume.glance
-- system.glusterfs.server.volume.keystone
-- system.glusterfs.server.cluster
-- system.salt.control.virt
-- system.salt.control.cluster.openstack_control_cluster
-- system.salt.control.cluster.openstack_proxy_cluster
-- system.salt.control.cluster.openstack_database_cluster
-- system.salt.control.cluster.openstack_message_queue_cluster
-- system.salt.control.cluster.openstack_telemetry_cluster
-# - system.salt.control.cluster.stacklight_server_cluster
-# - system.salt.control.cluster.stacklight_log_cluster
-# - system.salt.control.cluster.stacklight_telemetry_cluster
-- cluster.baremetal-mcp-ocata-ovs-ha.infra
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - service.keepalived.cluster.single
+  - system.glusterfs.server.volume.glance
+  - system.glusterfs.server.volume.keystone
+  - system.glusterfs.server.cluster
+  - system.salt.control.virt
+  - system.salt.control.cluster.openstack_control_cluster
+  - system.salt.control.cluster.openstack_proxy_cluster
+  - system.salt.control.cluster.openstack_database_cluster
+  - system.salt.control.cluster.openstack_message_queue_cluster
+  - system.salt.control.cluster.openstack_telemetry_cluster
+  # - system.salt.control.cluster.stacklight_server_cluster
+  # - system.salt.control.cluster.stacklight_log_cluster
+  # - system.salt.control.cluster.stacklight_telemetry_cluster
+  - cluster.baremetal-mcp-ocata-ovs-ha.infra
 parameters:
   _param:
     linux_system_codename: xenial
@@ -28,8 +29,8 @@ parameters:
     deploy_nic: enp6s0
   salt:
     control:
-      size: #RAM 4096,8192,16384,32768,65536
-      ##Default production sizing
+      size:  # RAM 4096,8192,16384,32768,65536
+        # Default production sizing
         openstack.control:
           cpu: 4
           ram: 12288
@@ -50,31 +51,29 @@ parameters:
           ram: 3072
           disk_profile: xxlarge
           net_profile: default
+        # stacklight.log:
+        #   cpu: 2
+        #   ram: 4096
+        #   disk_profile: xxlarge
+        #   net_profile: default
+        # stacklight.server:
+        #   cpu: 2
+        #   ram: 4096
+        #   disk_profile: small
+        #   net_profile: default
+        # stacklight.telemetry:
+        #   cpu: 2
+        #   ram: 4096
+        #   disk_profile: xxlarge
+        #   net_profile: default
         openstack.proxy:
           cpu: 2
           ram: 2048
           disk_profile: small
           net_profile: default
-#        stacklight.log:
-#          cpu: 2
-#          ram: 4096
-#          disk_profile: xxlarge
-#          net_profile: default
-#        stacklight.server:
-#          cpu: 2
-#          ram: 4096
-#          disk_profile: small
-#          net_profile: default
-#        stacklight.telemetry:
-#          cpu: 2
-#          ram: 4096
-#          disk_profile: xxlarge
-#          net_profile: default
       cluster:
         internal:
           node:
-            prx02:
-              provider: kvm03.${_param:cluster_domain}
             mdb01:
               image: ${_param:salt_control_xenial_image}
             mdb02:
@@ -103,6 +102,7 @@ parameters:
               image: ${_param:salt_control_xenial_image}
             prx02:
               image: ${_param:salt_control_xenial_image}
+              provider: kvm03.${_param:cluster_domain}
   virt:
     nic:
       default:
@@ -123,9 +123,9 @@ parameters:
             - ${_param:cluster_node02_address}:/srv/glusterfs/nova_instances
             - ${_param:cluster_node03_address}:/srv/glusterfs/nova_instances
           options:
-            cluster.readdir-optimize: On
-            nfs.disable: On
-            network.remote-dio: On
+            cluster.readdir-optimize: 'On'
+            nfs.disable: 'On'
+            network.remote-dio: 'On'
             diagnostics.client-log-level: WARNING
             diagnostics.brick-log-level: WARNING
   linux:
@@ -145,7 +145,7 @@ parameters:
           type: bridge
           name_servers: ${_param:opnfv_name_servers}
           use_interfaces:
-          - ${_param:deploy_nic}
+            - ${_param:deploy_nic}
           noifupdown: true
         mgmt-vlan:
           enabled: true
@@ -153,7 +153,7 @@ parameters:
           type: vlan
           name: ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
           use_interfaces:
-          - ${_param:deploy_nic}
+            - ${_param:deploy_nic}
         br-ctl:
           enabled: true
           type: bridge
@@ -161,4 +161,4 @@ parameters:
           address: ${_param:single_address}
           netmask: 255.255.255.0
           use_interfaces:
-          - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
+            - ${_param:deploy_nic}.${_param:opnfv_net_mgmt_vlan}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
index 3a98fac2a..2922fa380 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/infra/maas.yml
@@ -1,7 +1,8 @@
+---
 classes:
-- system.linux.system.repo.saltstack.xenial
-- system.maas.region.single
-- cluster.baremetal-mcp-ocata-ovs-ha.infra
+  - system.linux.system.repo.saltstack.xenial
+  - system.maas.region.single
+  - cluster.baremetal-mcp-ocata-ovs-ha.infra
 parameters:
   _param:
     dhcp_interface: ens3
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml
index e571689ef..0f7a36cf6 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/init.yml
@@ -1,4 +1,5 @@
+---
 classes:
-- cluster.all-mcp-ocata-common
-- cluster.baremetal-mcp-ocata-ovs-ha.infra
-- cluster.baremetal-mcp-ocata-ovs-ha.openstack
+  - cluster.all-mcp-ocata-common
+  - cluster.baremetal-mcp-ocata-ovs-ha.infra
+  - cluster.baremetal-mcp-ocata-ovs-ha.openstack
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml
index 371928a81..23a8d46f3 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/benchmark.yml
@@ -1,5 +1,6 @@
+---
 classes:
-- cluster.baremetal-mcp-ocata-ovs-ha
+  - cluster.baremetal-mcp-ocata-ovs-ha
 parameters:
   linux:
     network:
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
index fca40654a..ff97fe819 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/compute.yml
@@ -1,17 +1,18 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.linux.storage.loopback
-- system.glusterfs.client.cluster
-- system.nova.compute.cluster
-- system.nova.compute.nfv.hugepages
-- system.nova.compute.nfv.cpu_pinning
-- system.neutron.gateway.cluster
-- system.cinder.volume.single
-- system.cinder.volume.backend.lvm
-- system.ceilometer.agent.cluster
-- cluster.baremetal-mcp-ocata-ovs-ha.infra
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - system.linux.storage.loopback
+  - system.glusterfs.client.cluster
+  - system.nova.compute.cluster
+  - system.nova.compute.nfv.hugepages
+  - system.nova.compute.nfv.cpu_pinning
+  - system.neutron.gateway.cluster
+  - system.cinder.volume.single
+  - system.cinder.volume.backend.lvm
+  - system.ceilometer.agent.cluster
+  - cluster.baremetal-mcp-ocata-ovs-ha.infra
 parameters:
   _param:
     cluster_vip_address: ${_param:openstack_control_address}
@@ -39,6 +40,7 @@ parameters:
           server: ${_param:glusterfs_service_host}
           user: nova
           group: nova
+          # yamllint disable-line rule:line-length
           opts: "defaults,backup-volfile-servers=${_param:cluster_node01_address}:${_param:cluster_node02_address}:${_param:cluster_node03_address}"
   linux:
     system:
@@ -72,21 +74,21 @@ parameters:
           netmask: 255.255.255.0
           mtu: 1500
           use_interfaces:
-          - ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan}
+            - ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan}
         mgmt-vlan:
           enabled: true
           proto: manual
           type: vlan
           name: ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
           use_interfaces:
-          - ${_param:mgmt_nic}
+            - ${_param:mgmt_nic}
         tenant-vlan:
           enabled: true
           proto: manual
           type: vlan
           name: ${_param:tenant_nic}.${_param:opnfv_net_tenant_vlan}
           use_interfaces:
-          - ${_param:tenant_nic}
+            - ${_param:tenant_nic}
         br-ctl:
           enabled: true
           type: bridge
@@ -94,7 +96,7 @@ parameters:
           address: ${_param:single_address}
           netmask: 255.255.255.0
           use_interfaces:
-          - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
+            - ${_param:mgmt_nic}.${_param:opnfv_net_mgmt_vlan}
         br-floating:
           enabled: true
           type: ovs_bridge
@@ -111,6 +113,6 @@ parameters:
           address: ${_param:external_address}
           netmask: 255.255.255.0
           use_interfaces:
-          - ${_param:external_nic}
+            - ${_param:external_nic}
           use_ovs_ports:
-          - float-to-ex
+            - float-to-ex
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
index 1711ab0fe..f0c03cc0e 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control.yml
@@ -1,26 +1,27 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.ceilometer.client
-- system.memcached.server.single
-- system.keystone.server.cluster
-- system.keystone.server.wsgi
-- system.glance.control.cluster
-- system.neutron.control.openvswitch.cluster
-- system.nova.control.cluster
-- system.cinder.control.cluster
-- system.cinder.control.backend.lvm
-- system.heat.server.cluster
-- system.designate.server.cluster
-- system.designate.server.backend.bind
-- system.bind.server.single
-- system.haproxy.proxy.listen.openstack.nova-placement
-- system.haproxy.proxy.listen.openstack.glare
-- system.glusterfs.client.cluster
-- system.glusterfs.client.volume.glance
-- system.glusterfs.client.volume.keystone
-- cluster.baremetal-mcp-ocata-ovs-ha.infra
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - system.ceilometer.client
+  - system.memcached.server.single
+  - system.keystone.server.cluster
+  - system.keystone.server.wsgi
+  - system.glance.control.cluster
+  - system.neutron.control.openvswitch.cluster
+  - system.nova.control.cluster
+  - system.cinder.control.cluster
+  - system.cinder.control.backend.lvm
+  - system.heat.server.cluster
+  - system.designate.server.cluster
+  - system.designate.server.backend.bind
+  - system.bind.server.single
+  - system.haproxy.proxy.listen.openstack.nova-placement
+  - system.haproxy.proxy.listen.openstack.glare
+  - system.glusterfs.client.cluster
+  - system.glusterfs.client.volume.glance
+  - system.glusterfs.client.volume.keystone
+  - cluster.baremetal-mcp-ocata-ovs-ha.infra
 parameters:
   _param:
     keepalived_vip_interface: ens3
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control_init.yml
index e759c0c8d..79c387940 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control_init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/control_init.yml
@@ -1,9 +1,10 @@
+---
 classes:
-- system.keystone.client.single
-- system.keystone.client.service.aodh
-- system.keystone.client.service.ceilometer
-- system.keystone.client.service.nova21
-- system.keystone.client.service.nova-placement
-- system.keystone.client.service.glare
-- system.keystone.client.service.cinder3
-- system.keystone.client.service.designate
+  - system.keystone.client.single
+  - system.keystone.client.service.aodh
+  - system.keystone.client.service.ceilometer
+  - system.keystone.client.service.nova21
+  - system.keystone.client.service.nova-placement
+  - system.keystone.client.service.glare
+  - system.keystone.client.service.cinder3
+  - system.keystone.client.service.designate
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml
index 39cc073a6..f2e010da4 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/dashboard.yml
@@ -1,6 +1,7 @@
+---
 classes:
-- system.horizon.server.single
-- cluster.baremetal-mcp-ocata-ovs-ha
+  - system.horizon.server.single
+  - cluster.baremetal-mcp-ocata-ovs-ha
 parameters:
   _param:
     horizon_site_branding: OpenStack Dashboard
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
index 4cb7397f2..b8a43d814 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database.yml
@@ -1,19 +1,20 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.galera.server.cluster
-- system.galera.server.database.aodh
-- system.galera.server.database.ceilometer
-- system.galera.server.database.cinder
-- system.galera.server.database.designate
-- system.galera.server.database.glance
-- system.galera.server.database.grafana
-- system.galera.server.database.heat
-- system.galera.server.database.keystone
-- system.galera.server.database.nova
-- system.galera.server.database.neutron
-- cluster.baremetal-mcp-ocata-ovs-ha
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - system.galera.server.cluster
+  - system.galera.server.database.aodh
+  - system.galera.server.database.ceilometer
+  - system.galera.server.database.cinder
+  - system.galera.server.database.designate
+  - system.galera.server.database.glance
+  - system.galera.server.database.grafana
+  - system.galera.server.database.heat
+  - system.galera.server.database.keystone
+  - system.galera.server.database.nova
+  - system.galera.server.database.neutron
+  - cluster.baremetal-mcp-ocata-ovs-ha
 parameters:
   _param:
     keepalived_vip_interface: ens3
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database_init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database_init.yml
index b16f05593..5dcb9c9e1 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database_init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/database_init.yml
@@ -1,2 +1,3 @@
+---
 classes:
-- system.mysql.client.single
+  - system.mysql.client.single
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
index eff56516d..7ce282be5 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/init.yml
@@ -1,8 +1,10 @@
+---
 parameters:
   _param:
 
     openstack_version: ocata
 
+    # yamllint disable rule:line-length
     openstack_gateway_node01_address: ${_param:opnfv_openstack_gateway_node01_address}
     openstack_gateway_node02_address: ${_param:opnfv_openstack_gateway_node02_address}
     openstack_gateway_node03_address: ${_param:opnfv_openstack_gateway_node03_address}
@@ -77,17 +79,17 @@ parameters:
 
     openstack_region: RegionOne
     admin_email: root@localhost
-    ##Neutron osv/nodvr
-    neutron_control_dvr: False
+    # Neutron osv/nodvr
+    neutron_control_dvr: 'False'
     neutron_tenant_network_types: "flat,vxlan"
-    neutron_l3_ha: True
+    neutron_l3_ha: 'True'
     neutron_global_physnet_mtu: 1500
     neutron_external_mtu: 1500
-    neutron_gateway_dvr: False
+    neutron_gateway_dvr: 'False'
     neutron_gateway_agent_mode: legacy
-    neutron_compute_dvr: False
+    neutron_compute_dvr: 'False'
     neutron_compute_agent_mode: legacy
-    neutron_compute_external_access: True
+    neutron_compute_external_access: 'True'
     galera_server_cluster_name: openstack_cluster
     galera_server_maintenance_password: opnfv_secret
     galera_server_admin_password: opnfv_secret
@@ -182,129 +184,129 @@ parameters:
       rndc_key_file: /etc/designate/rndc.key
     designate_version: ${_param:openstack_version}
     # Billing
-    #keystone_billometer_password: opnfv_secret
-    #keystone_billometer_address: ${_param:billometer_service_host}
-    #billometer_service_host: ${_param:openstack_billing_address}
-    #billometer_version: ${_param:openstack_version}
-    #billometer_secret_key: opnfv_secretpasswordpasswordpassword
-    #billometer_identity_password: ${_param:keystone_billometer_password}
-    #billometer_identity_host: ${_param:openstack_control_address}
-    #billometer_identity_token: ${_param:keystone_service_token}
+    # keystone_billometer_password: opnfv_secret
+    # keystone_billometer_address: ${_param:billometer_service_host}
+    # billometer_service_host: ${_param:openstack_billing_address}
+    # billometer_version: ${_param:openstack_version}
+    # billometer_secret_key: opnfv_secretpasswordpasswordpassword
+    # billometer_identity_password: ${_param:keystone_billometer_password}
+    # billometer_identity_host: ${_param:openstack_control_address}
+    # billometer_identity_token: ${_param:keystone_service_token}
   linux:
     network:
       host:
         prx:
           address: ${_param:openstack_proxy_address}
           names:
-          - ${_param:openstack_proxy_hostname}
-          - ${_param:openstack_proxy_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_proxy_hostname}
+            - ${_param:openstack_proxy_hostname}.${_param:cluster_domain}
         prx01:
           address: ${_param:openstack_proxy_node01_address}
           names:
-          - ${_param:openstack_proxy_node01_hostname}
-          - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_proxy_node01_hostname}
+            - ${_param:openstack_proxy_node01_hostname}.${_param:cluster_domain}
         prx02:
           address: ${_param:openstack_proxy_node02_address}
           names:
-          - ${_param:openstack_proxy_node02_hostname}
-          - ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_proxy_node02_hostname}
+            - ${_param:openstack_proxy_node02_hostname}.${_param:cluster_domain}
         ctl:
           address: ${_param:openstack_control_address}
           names:
-          - ${_param:openstack_control_hostname}
-          - ${_param:openstack_control_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_control_hostname}
+            - ${_param:openstack_control_hostname}.${_param:cluster_domain}
         ctl01:
           address: ${_param:openstack_control_node01_address}
           names:
-          - ${_param:openstack_control_node01_hostname}
-          - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_control_node01_hostname}
+            - ${_param:openstack_control_node01_hostname}.${_param:cluster_domain}
         ctl02:
           address: ${_param:openstack_control_node02_address}
           names:
-          - ${_param:openstack_control_node02_hostname}
-          - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_control_node02_hostname}
+            - ${_param:openstack_control_node02_hostname}.${_param:cluster_domain}
         ctl03:
           address: ${_param:openstack_control_node03_address}
           names:
-          - ${_param:openstack_control_node03_hostname}
-          - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_control_node03_hostname}
+            - ${_param:openstack_control_node03_hostname}.${_param:cluster_domain}
         msg:
           address: ${_param:openstack_message_queue_address}
           names:
-          - ${_param:openstack_message_queue_hostname}
-          - ${_param:openstack_message_queue_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_message_queue_hostname}
+            - ${_param:openstack_message_queue_hostname}.${_param:cluster_domain}
         msg01:
           address: ${_param:openstack_message_queue_node01_address}
           names:
-          - ${_param:openstack_message_queue_node01_hostname}
-          - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_message_queue_node01_hostname}
+            - ${_param:openstack_message_queue_node01_hostname}.${_param:cluster_domain}
         msg02:
           address: ${_param:openstack_message_queue_node02_address}
           names:
-          - ${_param:openstack_message_queue_node02_hostname}
-          - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_message_queue_node02_hostname}
+            - ${_param:openstack_message_queue_node02_hostname}.${_param:cluster_domain}
         msg03:
           address: ${_param:openstack_message_queue_node03_address}
           names:
-          - ${_param:openstack_message_queue_node03_hostname}
-          - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_message_queue_node03_hostname}
+            - ${_param:openstack_message_queue_node03_hostname}.${_param:cluster_domain}
         dbs:
           address: ${_param:openstack_database_address}
           names:
-          - ${_param:openstack_database_hostname}
-          - ${_param:openstack_database_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_database_hostname}
+            - ${_param:openstack_database_hostname}.${_param:cluster_domain}
         dbs01:
           address: ${_param:openstack_database_node01_address}
           names:
-          - ${_param:openstack_database_node01_hostname}
-          - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_database_node01_hostname}
+            - ${_param:openstack_database_node01_hostname}.${_param:cluster_domain}
         dbs02:
           address: ${_param:openstack_database_node02_address}
           names:
-          - ${_param:openstack_database_node02_hostname}
-          - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_database_node02_hostname}
+            - ${_param:openstack_database_node02_hostname}.${_param:cluster_domain}
         dbs03:
           address: ${_param:openstack_database_node03_address}
           names:
-          - ${_param:openstack_database_node03_hostname}
-          - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_database_node03_hostname}
+            - ${_param:openstack_database_node03_hostname}.${_param:cluster_domain}
         mdb:
           address: ${_param:openstack_telemetry_address}
           names:
-          - ${_param:openstack_telemetry_hostname}
-          - ${_param:openstack_telemetry_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_telemetry_hostname}
+            - ${_param:openstack_telemetry_hostname}.${_param:cluster_domain}
         mdb01:
           address: ${_param:openstack_telemetry_node01_address}
           names:
-          - ${_param:openstack_telemetry_node01_hostname}
-          - ${_param:openstack_telemetry_node01_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_telemetry_node01_hostname}
+            - ${_param:openstack_telemetry_node01_hostname}.${_param:cluster_domain}
         mdb02:
           address: ${_param:openstack_telemetry_node02_address}
           names:
-          - ${_param:openstack_telemetry_node02_hostname}
-          - ${_param:openstack_telemetry_node02_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_telemetry_node02_hostname}
+            - ${_param:openstack_telemetry_node02_hostname}.${_param:cluster_domain}
         mdb03:
           address: ${_param:openstack_telemetry_node03_address}
           names:
-          - ${_param:openstack_telemetry_node03_hostname}
-          - ${_param:openstack_telemetry_node03_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_telemetry_node03_hostname}
+            - ${_param:openstack_telemetry_node03_hostname}.${_param:cluster_domain}
         cmp001:
           address: ${_param:openstack_compute_node01_control_address}
           names:
-          - ${_param:openstack_compute_node01_hostname}
-          - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_compute_node01_hostname}
+            - ${_param:openstack_compute_node01_hostname}.${_param:cluster_domain}
         cmp002:
           address: ${_param:openstack_compute_node02_control_address}
           names:
-          - ${_param:openstack_compute_node02_hostname}
-          - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_compute_node02_hostname}
+            - ${_param:openstack_compute_node02_hostname}.${_param:cluster_domain}
         gtw01:
           address: ${_param:openstack_gateway_node01_address}
           names:
-          - ${_param:openstack_gateway_node01_hostname}
-          - ${_param:openstack_gateway_node01_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_gateway_node01_hostname}
+            - ${_param:openstack_gateway_node01_hostname}.${_param:cluster_domain}
         gtw02:
           address: ${_param:openstack_gateway_node02_address}
           names:
-          - ${_param:openstack_gateway_node02_hostname}
-          - ${_param:openstack_gateway_node02_hostname}.${_param:cluster_domain}
+            - ${_param:openstack_gateway_node02_hostname}
+            - ${_param:openstack_gateway_node02_hostname}.${_param:cluster_domain}
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
index 881644bf4..66b58221c 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/message_queue.yml
@@ -1,10 +1,11 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.rabbitmq.server.cluster
-- system.rabbitmq.server.vhost.openstack
-- cluster.baremetal-mcp-ocata-ovs-ha
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - system.rabbitmq.server.cluster
+  - system.rabbitmq.server.vhost.openstack
+  - cluster.baremetal-mcp-ocata-ovs-ha
 parameters:
   _param:
     keepalived_vip_interface: ens3
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
index 5e9a2c544..e948d93ad 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/proxy.yml
@@ -1,20 +1,21 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.nginx.server.single
-- system.nginx.server.proxy.openstack_api
-- system.nginx.server.proxy.openstack_vnc
-- system.nginx.server.proxy.openstack_web
-- system.nginx.server.proxy.openstack.aodh
-- system.nginx.server.proxy.openstack.ceilometer
-- system.horizon.server.single
-- system.salt.minion.cert.proxy
-- system.sphinx.server.doc.reclass
-- service.keepalived.cluster.single
-- cluster.baremetal-mcp-ocata-ovs-ha.infra
-- cluster.baremetal-mcp-ocata-ovs-ha.openstack.dashboard
-# - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.proxy
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - system.nginx.server.single
+  - system.nginx.server.proxy.openstack_api
+  - system.nginx.server.proxy.openstack_vnc
+  - system.nginx.server.proxy.openstack_web
+  - system.nginx.server.proxy.openstack.aodh
+  - system.nginx.server.proxy.openstack.ceilometer
+  - system.horizon.server.single
+  - system.salt.minion.cert.proxy
+  - system.sphinx.server.doc.reclass
+  - service.keepalived.cluster.single
+  - cluster.baremetal-mcp-ocata-ovs-ha.infra
+  - cluster.baremetal-mcp-ocata-ovs-ha.openstack.dashboard
+  # - cluster.baremetal-mcp-ocata-ovs-ha.stacklight.proxy
 parameters:
   _param:
     keepalived_vip_interface: ens3
diff --git a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
index 0e3c7bdae..4389a4918 100644
--- a/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
+++ b/mcp/reclass/classes/cluster/baremetal-mcp-ocata-ovs-ha/openstack/telemetry.yml
@@ -1,15 +1,16 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.mongodb.server.cluster
-- system.mongodb.server.database.ceilometer
-- system.ceilometer.server.backend.mongodb
-# - system.ceilometer.server.backend.influxdb
-# - system.heka.ceilometer_collector.single
-- system.ceilometer.server.cluster
-- system.aodh.server.cluster
-- cluster.baremetal-mcp-ocata-ovs-ha.infra
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - system.mongodb.server.cluster
+  - system.mongodb.server.database.ceilometer
+  - system.ceilometer.server.backend.mongodb
+  # - system.ceilometer.server.backend.influxdb
+  # - system.heka.ceilometer_collector.single
+  - system.ceilometer.server.cluster
+  - system.aodh.server.cluster
+  - cluster.baremetal-mcp-ocata-ovs-ha.infra
 parameters:
   _param:
     keepalived_openstack_telemetry_vip_interface: ens3
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml
index f4ad1bfc2..63e506d9a 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/haproxy_openstack_api.yml
@@ -1,3 +1,4 @@
+---
 parameters:
   _param:
     haproxy_check: check inter 15s fastinter 2s downinter 4s rise 3 fall 3
@@ -8,181 +9,181 @@ parameters:
           type: openstack-service
           service_name: cinder
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8776
+            - address: ${_param:cluster_vip_address}
+              port: 8776
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8776
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 8776
+              params: ${_param:haproxy_check}
         glance_api:
           type: openstack-service
           service_name: glance
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 9292
+            - address: ${_param:cluster_vip_address}
+              port: 9292
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 9292
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 9292
+              params: ${_param:haproxy_check}
         glance_registry_api:
           type: general-service
           service_name: glance
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 9191
+            - address: ${_param:cluster_vip_address}
+              port: 9191
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 9191
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 9191
+              params: ${_param:haproxy_check}
         glare:
           type: general-service
           service_name: glare
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 9494
+            - address: ${_param:cluster_vip_address}
+              port: 9494
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 9494
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 9494
+              params: ${_param:haproxy_check}
         heat_cloudwatch_api:
           type: openstack-service
           service_name: heat
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8003
+            - address: ${_param:cluster_vip_address}
+              port: 8003
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8003
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 8003
+              params: ${_param:haproxy_check}
         heat_api:
           type: openstack-service
           service_name: heat
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8004
+            - address: ${_param:cluster_vip_address}
+              port: 8004
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8004
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 8004
+              params: ${_param:haproxy_check}
         heat_cfn_api:
           type: openstack-service
           service_name: heat
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8000
+            - address: ${_param:cluster_vip_address}
+              port: 8000
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8000
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 8000
+              params: ${_param:haproxy_check}
         keystone_public_api:
           type: openstack-service
           service_name: keystone
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 5000
+            - address: ${_param:cluster_vip_address}
+              port: 5000
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 5000
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 5000
+              params: ${_param:haproxy_check}
         keystone_admin_api:
           type: openstack-service
           service_name: keystone
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 35357
+            - address: ${_param:cluster_vip_address}
+              port: 35357
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 35357
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 35357
+              params: ${_param:haproxy_check}
         neutron_api:
           type: openstack-service
           service_name: neutron
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 9696
+            - address: ${_param:cluster_vip_address}
+              port: 9696
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 9696
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 9696
+              params: ${_param:haproxy_check}
         nova_placement_api:
           mode: http
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8778
+            - address: ${_param:cluster_vip_address}
+              port: 8778
           options:
-          - httpclose
-          - httplog
+            - httpclose
+            - httplog
           health-check:
             http:
               options:
-              - expect status 401
+                - expect status 401
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8778
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 8778
+              params: ${_param:haproxy_check}
         nova_ec2_api:
           type: general-service
           service_name: nova
           check: false
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8773
+            - address: ${_param:cluster_vip_address}
+              port: 8773
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8773
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 8773
+              params: ${_param:haproxy_check}
         nova_api:
           type: openstack-service
           service_name: nova
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8774
+            - address: ${_param:cluster_vip_address}
+              port: 8774
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8774
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 8774
+              params: ${_param:haproxy_check}
         nova_metadata_api:
           type: openstack-service
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8775
+            - address: ${_param:cluster_vip_address}
+              port: 8775
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8775
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 8775
+              params: ${_param:haproxy_check}
         ceilometer_api:
           type: general-service
           check: false
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8777
+            - address: ${_param:cluster_vip_address}
+              port: 8777
           servers:
-          - name: ${_param:cluster_node01_hostname}
-            host: ${_param:cluster_node01_address}
-            port: 8777
-            params: ${_param:haproxy_check}
+            - name: ${_param:cluster_node01_hostname}
+              host: ${_param:cluster_node01_address}
+              port: 8777
+              params: ${_param:haproxy_check}
         aodh-api:
           type: openstack-service
           service_name: aodh
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8042
+            - address: ${_param:cluster_vip_address}
+              port: 8042
           servers:
-          - name: ctl01
-            host: ${_param:cluster_node01_address}
-            port: 8042
-            params: ${_param:haproxy_check}
+            - name: ctl01
+              host: ${_param:cluster_node01_address}
+              port: 8042
+              params: ${_param:haproxy_check}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
index 73e2da5a9..07fada64d 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/config.yml
@@ -1,15 +1,16 @@
+---
 classes:
-- service.git.client
-- system.linux.system.single
-- system.linux.system.repo.mcp.salt
-- system.salt.master.api
-- system.salt.master.pkg
-- system.reclass.storage.salt
-- system.salt.minion.ca.salt_master
-- system.salt.minion.cert.proxy
-- system.mysql.client.single
-- system.reclass.storage.system.openstack_compute_multi
-- system.reclass.storage.system.openstack_gateway_single
+  - service.git.client
+  - system.linux.system.single
+  - system.linux.system.repo.mcp.salt
+  - system.salt.master.api
+  - system.salt.master.pkg
+  - system.reclass.storage.salt
+  - system.salt.minion.ca.salt_master
+  - system.salt.minion.cert.proxy
+  - system.mysql.client.single
+  - system.reclass.storage.system.openstack_compute_multi
+  - system.reclass.storage.system.openstack_gateway_single
 parameters:
   _param:
     openstack_control_node01_hostname: ctl01
@@ -20,6 +21,7 @@ parameters:
     salt_master_host: 127.0.0.1
     salt_master_base_environment: prd
     salt_minion_ca_host: ${linux:network:fqdn}
+    # yamllint disable-line rule:line-length
     salt_api_password_hash: "$6$sGnRlxGf$al5jMCetLP.vfI/fTl3Z0N7Za1aeiexL487jAtyRABVfT3NlwZxQGVhO7S1N8OwS/34VHYwZQA8lkXwKMN/GS1"
   linux:
     network:
@@ -43,7 +45,7 @@ parameters:
           name: ${_param:openstack_control_node01_hostname}
           domain: ${_param:cluster_domain}
           classes:
-          - cluster.${_param:cluster_name}.openstack.control
+            - cluster.${_param:cluster_name}.openstack.control
           params:
             linux_system_codename: xenial
             salt_master_host: ${_param:reclass_config_master}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml
index 9140bd0bc..e027e5b12 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/infra/init.yml
@@ -1,3 +1,4 @@
+---
 parameters:
   linux:
     network:
@@ -5,10 +6,10 @@ parameters:
         cfg01:
           address: ${_param:infra_config_address}
           names:
-          - cfg01
-          - cfg01.${_param:cluster_domain}
+            - cfg01
+            - cfg01.${_param:cluster_domain}
         cfg:
           address: ${_param:infra_config_address}
           names:
-          - cfg
-          - cfg.${_param:cluster_domain}
+            - cfg
+            - cfg.${_param:cluster_domain}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml
index 53e312787..18f8571a3 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/init_options.yml
@@ -1,3 +1,4 @@
+---
 parameters:
   _param:
     # infra service addresses
@@ -9,6 +10,7 @@ parameters:
     openstack_control_node03_address: 172.16.10.103
     openstack_database_address: ${_param:openstack_control_address}
     openstack_message_queue_address: ${_param:openstack_control_address}
+    # yamllint disable rule:line-length
     openstack_message_queue_node01_address: ${_param:openstack_control_node01_address}
     openstack_message_queue_node02_address: ${_param:openstack_control_node02_address}
     openstack_message_queue_node03_address: ${_param:openstack_control_node03_address}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
index 99f517f8a..6bc5e77cb 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_compute.yml
@@ -1,16 +1,17 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.linux.storage.loopback
-- service.nfs.client
-- system.nova.compute.single
-- service.neutron.compute.single
-- service.cinder.volume.single
-- system.cinder.volume.backend.lvm
-- system.ceilometer.agent.cluster
-- system.ceilometer.client.nova_compute
-- system.ceilometer.client.cinder_volume
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - system.linux.storage.loopback
+  - service.nfs.client
+  - system.nova.compute.single
+  - service.neutron.compute.single
+  - service.cinder.volume.single
+  - system.cinder.volume.backend.lvm
+  - system.ceilometer.agent.cluster
+  - system.ceilometer.client.nova_compute
+  - system.ceilometer.client.cinder_volume
 parameters:
   _param:
     primary_interface: ${_param:opnfv_fn_vm_secondary_interface}
@@ -86,4 +87,4 @@ parameters:
           address: ${_param:single_address}
           netmask: 255.255.255.0
           use_interfaces:
-          - ${_param:primary_interface}
+            - ${_param:primary_interface}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
index 6ac8f6d62..4c9af8d55 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_control.yml
@@ -1,44 +1,45 @@
+---
 classes:
-- system.linux.system.lowmem
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- service.nfs.server
-- system.mongodb.server.single
-- system.mongodb.server.database.ceilometer
-- system.ceilometer.client
-- system.ceilometer.client.neutron
-- system.memcached.server.single
-- system.rabbitmq.server.single
-- system.rabbitmq.server.vhost.openstack
-- system.keystone.server.wsgi
-- system.keystone.server.single
-- system.keystone.client.single
-- system.keystone.client.service.nova21
-- system.keystone.client.service.nova-placement
-- system.keystone.client.service.glare
-- system.keystone.client.service.cinder3
-- system.keystone.client.service.ceilometer
-- system.keystone.client.service.aodh
-- system.glance.control.single
-- system.nova.control.single
-- system.cinder.control.single
-- system.cinder.control.backend.lvm
-- system.heat.server.single
-- service.mysql.server.single
-- system.galera.server.database.cinder
-- system.galera.server.database.glance
-- system.galera.server.database.grafana
-- system.galera.server.database.heat
-- system.galera.server.database.keystone
-- system.galera.server.database.nova
-- system.galera.server.database.ceilometer
-- system.galera.server.database.aodh
-- service.ceilometer.server.single
-- system.aodh.server.single
-- system.horizon.server.single
-- service.haproxy.proxy.single
-- cluster.virtual-mcp-ocata-common.haproxy_openstack_api
+  - system.linux.system.lowmem
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - service.nfs.server
+  - system.mongodb.server.single
+  - system.mongodb.server.database.ceilometer
+  - system.ceilometer.client
+  - system.ceilometer.client.neutron
+  - system.memcached.server.single
+  - system.rabbitmq.server.single
+  - system.rabbitmq.server.vhost.openstack
+  - system.keystone.server.wsgi
+  - system.keystone.server.single
+  - system.keystone.client.single
+  - system.keystone.client.service.nova21
+  - system.keystone.client.service.nova-placement
+  - system.keystone.client.service.glare
+  - system.keystone.client.service.cinder3
+  - system.keystone.client.service.ceilometer
+  - system.keystone.client.service.aodh
+  - system.glance.control.single
+  - system.nova.control.single
+  - system.cinder.control.single
+  - system.cinder.control.backend.lvm
+  - system.heat.server.single
+  - service.mysql.server.single
+  - system.galera.server.database.cinder
+  - system.galera.server.database.glance
+  - system.galera.server.database.grafana
+  - system.galera.server.database.heat
+  - system.galera.server.database.keystone
+  - system.galera.server.database.nova
+  - system.galera.server.database.ceilometer
+  - system.galera.server.database.aodh
+  - service.ceilometer.server.single
+  - system.aodh.server.single
+  - system.horizon.server.single
+  - service.haproxy.proxy.single
+  - cluster.virtual-mcp-ocata-common.haproxy_openstack_api
 parameters:
   _param:
     linux_system_codename: xenial
@@ -67,16 +68,16 @@ parameters:
     server:
       admin_email: ${_param:admin_email}
       pkgs:
-      - keystone
-      - python-keystone
-      - python-keystoneclient
-      - python-psycopg2
-      - python-mysqldb
-      - python-six
-      - python-memcache
-      - python-openstackclient
-      - gettext-base
-      - python-pycadf
+        - keystone
+        - python-keystone
+        - python-keystoneclient
+        - python-psycopg2
+        - python-mysqldb
+        - python-six
+        - python-memcache
+        - python-openstackclient
+        - gettext-base
+        - python-pycadf
   glance:
     server:
       storage:
@@ -129,6 +130,6 @@ parameters:
             nova:
               host: ${_param:single_address}/24
               params:
-              - rw
-              - no_root_squash
-              - async
+                - rw
+                - no_root_squash
+                - async
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
index f726c4af2..b0316f209 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_gateway.yml
@@ -1,7 +1,8 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
 parameters:
   _param:
     primary_interface: ${_param:opnfv_fn_vm_secondary_interface}
@@ -53,7 +54,7 @@ parameters:
           netmask: 255.255.255.0
           mtu: ${_param:interface_mtu}
           use_interfaces:
-          - ${_param:primary_interface}
+            - ${_param:primary_interface}
         float-to-ex:
           enabled: true
           type: ovs_port
@@ -66,6 +67,6 @@ parameters:
           address: ${_param:external_address}
           netmask: 255.255.255.0
           use_interfaces:
-          - ${_param:external_interface}
+            - ${_param:external_interface}
           use_ovs_ports:
-          - float-to-ex
+            - float-to-ex
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
index a14a7113a..8ac2391b7 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-common/openstack_init.yml
@@ -1,3 +1,4 @@
+---
 parameters:
   _param:
     openstack_version: ocata
@@ -8,15 +9,15 @@ parameters:
     cluster_public_protocol: http
     cluster_public_host: 10.16.0.101
     neutron_public_protocol: http
-    neutron_control_dvr: False
-    neutron_l3_ha: False
+    neutron_control_dvr: 'False'
+    neutron_l3_ha: 'False'
     neutron_global_physnet_mtu: 1500
     neutron_external_mtu: 1500
-    neutron_gateway_dvr: False
+    neutron_gateway_dvr: 'False'
     neutron_gateway_agent_mode: legacy
-    neutron_compute_dvr: False
+    neutron_compute_dvr: 'False'
     neutron_compute_agent_mode: legacy
-    neutron_compute_external_access: False
+    neutron_compute_external_access: 'False'
     galera_server_cluster_name: openstack_cluster
     galera_server_maintenance_password: opnfv_secret
     galera_server_admin_password: opnfv_secret
@@ -51,7 +52,6 @@ parameters:
     nova_vncproxy_url: http://${_param:cluster_vip_address}:8060
     neutron_version: ${_param:openstack_version}
     neutron_service_host: ${_param:cluster_local_address}
-    metadata_password: password
     mysql_admin_user: root
     mysql_admin_password: opnfv_secret
     mysql_cinder_password: opnfv_secret
@@ -75,6 +75,7 @@ parameters:
     ceilometer_secret_key: opnfv_secret
     metadata_password: opnfv_secret
     horizon_version: ${_param:openstack_version}
+    # yamllint disable-line rule:line-length
     horizon_secret_key: opaesee8Que2yahJoh9fo0eefo1Aeyo6ahyei8zeiboh3aeth5loth7ieNa5xi5e
     horizon_identity_host: ${_param:cluster_vip_address}
     horizon_identity_encryption: none
@@ -82,6 +83,7 @@ parameters:
     mongodb_server_replica_set: ceilometer
     mongodb_ceilometer_password: opnfv_secret
     mongodb_admin_password: opnfv_secret
+    # yamllint disable-line rule:line-length
     mongodb_shared_key: eoTh1AwahlahqueingeejooLughah4tei9feing0eeVaephooDi2li1TaeV1ooth
     aodh_version: ${_param:openstack_version}
     keystone_aodh_password: opnfv_secret
@@ -98,25 +100,25 @@ parameters:
         ctl:
           address: ${_param:openstack_control_address}
           names:
-          - ctl
-          - ctl.${_param:cluster_domain}
+            - ctl
+            - ctl.${_param:cluster_domain}
         ctl01:
           address: ${_param:openstack_control_node01_address}
           names:
-          - ctl01
-          - ctl01.${_param:cluster_domain}
+            - ctl01
+            - ctl01.${_param:cluster_domain}
         gtw01:
           address: ${_param:openstack_gateway_address}
           names:
-          - gtw01
-          - gtw01.${_param:cluster_domain}
+            - gtw01
+            - gtw01.${_param:cluster_domain}
         cmp01:
           address: 172.16.10.105
           names:
-          - cmp01
-          - cmp01.${_param:cluster_domain}
+            - cmp01
+            - cmp01.${_param:cluster_domain}
         cmp02:
           address: 172.16.10.106
           names:
-          - cmp02
-          - cmp02.${_param:cluster_domain}
+            - cmp02
+            - cmp02.${_param:cluster_domain}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
index c66ba2a9c..f8d80ed2c 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/infra/config.yml
@@ -1,14 +1,15 @@
+---
 classes:
-- system.reclass.storage.system.opendaylight_control_single
-- cluster.virtual-mcp-ocata-common.infra.config
-- cluster.virtual-mcp-ocata-odl-router
+  - system.reclass.storage.system.opendaylight_control_single
+  - cluster.virtual-mcp-ocata-common.infra.config
+  - cluster.virtual-mcp-ocata-odl-router
 parameters:
   reclass:
     storage:
       node:
         opendaylight_control_node01:
           classes:
-          - cluster.${_param:cluster_name}.opendaylight.control
+            - cluster.${_param:cluster_name}.opendaylight.control
           params:
             linux_system_codename: xenial
             single_address: ${_param:opendaylight_service_host}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml
index 20d6d18d3..1f86ba534 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/init.yml
@@ -1,9 +1,10 @@
+---
 classes:
-- system.linux.system.single
-- cluster.all-mcp-ocata-common
-- cluster.virtual-mcp-ocata-common.init_options
-- cluster.virtual-mcp-ocata-common.infra
-- cluster.virtual-mcp-ocata-odl-router.openstack
+  - system.linux.system.single
+  - cluster.all-mcp-ocata-common
+  - cluster.virtual-mcp-ocata-common.init_options
+  - cluster.virtual-mcp-ocata-common.infra
+  - cluster.virtual-mcp-ocata-odl-router.openstack
 
 parameters:
   _param:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml
index 8f83ddee8..d47e5cc3d 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/opendaylight/control.yml
@@ -1,9 +1,10 @@
+---
 classes:
-- system.linux.system.repo.mcp.openstack
-- system.linux.system.repo.mcp.extra
-- system.linux.system.repo.saltstack.xenial
-- system.opendaylight.server.single
-- cluster.virtual-mcp-ocata-odl-router
+  - system.linux.system.repo.mcp.openstack
+  - system.linux.system.repo.mcp.extra
+  - system.linux.system.repo.saltstack.xenial
+  - system.opendaylight.server.single
+  - cluster.virtual-mcp-ocata-odl-router
 parameters:
   _param:
     linux_system_codename: xenial
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
index 5cfcd8d05..038df5c06 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/compute.yml
@@ -1,6 +1,7 @@
+---
 classes:
-- cluster.virtual-mcp-ocata-common.openstack_compute
-- cluster.virtual-mcp-ocata-odl-router
+  - cluster.virtual-mcp-ocata-common.openstack_compute
+  - cluster.virtual-mcp-ocata-odl-router
 parameters:
   opendaylight:
     client:
@@ -26,7 +27,7 @@ parameters:
           netmask: 255.255.255.0
           gateway: 10.1.0.110
           use_interfaces:
-          - ${_param:tenant_interface}
+            - ${_param:tenant_interface}
         br-floating:
           enabled: true
           type: ovs_bridge
@@ -43,6 +44,6 @@ parameters:
           address: ${_param:external_address}
           netmask: 255.255.255.0
           use_interfaces:
-          - ${_param:external_interface}
+            - ${_param:external_interface}
           use_ovs_ports:
-          - float-to-ex
+            - float-to-ex
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml
index 729b2f903..19083e5ff 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/control.yml
@@ -1,7 +1,8 @@
+---
 classes:
-- system.neutron.control.opendaylight.single
-- cluster.virtual-mcp-ocata-common.openstack_control
-- cluster.virtual-mcp-ocata-odl-router
+  - system.neutron.control.opendaylight.single
+  - cluster.virtual-mcp-ocata-common.openstack_control
+  - cluster.virtual-mcp-ocata-odl-router
 parameters:
   neutron:
     server:
@@ -14,21 +15,21 @@ parameters:
           type: general-service
           service_name: opendaylight
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8181
+            - address: ${_param:cluster_vip_address}
+              port: 8181
           servers:
-          - name: odl01
-            host: ${_param:opendaylight_service_host}
-            port: 8181
-            params: ${_param:haproxy_check}
+            - name: odl01
+              host: ${_param:opendaylight_service_host}
+              port: 8181
+              params: ${_param:haproxy_check}
         opendaylight-rest:
           type: general-service
           service_name: opendaylight
           binds:
-          - address: ${_param:cluster_vip_address}
-            port: 8282
+            - address: ${_param:cluster_vip_address}
+              port: 8282
           servers:
-          - name: odl01
-            host: ${_param:opendaylight_service_host}
-            port: 8282
-            params: ${_param:haproxy_check}
+            - name: odl01
+              host: ${_param:opendaylight_service_host}
+              port: 8282
+              params: ${_param:haproxy_check}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml
index 8e5672f63..9cacab73b 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/gateway.yml
@@ -1,12 +1,13 @@
+---
 classes:
-- cluster.virtual-mcp-ocata-common.openstack_gateway
-- system.neutron.gateway.opendaylight.single
-- cluster.virtual-mcp-ocata-odl-router
+  - cluster.virtual-mcp-ocata-common.openstack_gateway
+  - system.neutron.gateway.opendaylight.single
+  - cluster.virtual-mcp-ocata-odl-router
 parameters:
   _param:
     neutron_agents:
-    - neutron-dhcp-agent
-    - neutron-metadata-agent
+      - neutron-dhcp-agent
+      - neutron-metadata-agent
   neutron:
     gateway:
       pkgs: ${_param:neutron_agents}
@@ -30,4 +31,4 @@ parameters:
           address: ${_param:tenant_address}
           netmask: 255.255.255.0
           use_interfaces:
-          - ${_param:tenant_interface}
+            - ${_param:tenant_interface}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml
index af01e01b4..ed03eb43d 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-odl-router/openstack/init.yml
@@ -1,5 +1,6 @@
+---
 classes:
-- cluster.virtual-mcp-ocata-common.openstack_init
+  - cluster.virtual-mcp-ocata-common.openstack_init
 parameters:
   _param:
     neutron_tenant_network_types: "flat,vxlan"
@@ -8,6 +9,7 @@ parameters:
     system:
       repo:
         uca:
+          # yamllint disable-line rule:line-length
           source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
           architectures: amd64
           key_id: EC4926EA
@@ -17,5 +19,5 @@ parameters:
         odl01:
           address: 172.16.10.111
           names:
-          - odl01
-          - odl01.${_param:cluster_domain}
+            - odl01
+            - odl01.${_param:cluster_domain}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
index 784011ad0..24163f9b2 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/infra/config.yml
@@ -1,6 +1,7 @@
+---
 classes:
-- cluster.virtual-mcp-ocata-common.infra.config
-- cluster.virtual-mcp-ocata-ovs-dpdk
+  - cluster.virtual-mcp-ocata-common.infra.config
+  - cluster.virtual-mcp-ocata-ovs-dpdk
 parameters:
   reclass:
     storage:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml
index e4e09b52b..5436bfc01 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/init.yml
@@ -1,9 +1,10 @@
+---
 classes:
-- system.linux.system.single
-- cluster.all-mcp-ocata-common
-- cluster.virtual-mcp-ocata-common.init_options
-- cluster.virtual-mcp-ocata-common.infra
-- cluster.virtual-mcp-ocata-ovs-dpdk.openstack
+  - system.linux.system.single
+  - cluster.all-mcp-ocata-common
+  - cluster.virtual-mcp-ocata-common.init_options
+  - cluster.virtual-mcp-ocata-common.infra
+  - cluster.virtual-mcp-ocata-ovs-dpdk.openstack
 
 parameters:
   _param:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
index 12e261dab..da4ecaf97 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/compute.yml
@@ -1,8 +1,9 @@
+---
 classes:
-- system.nova.compute.nfv.hugepages
-- system.neutron.compute.nfv.dpdk
-- cluster.virtual-mcp-ocata-common.openstack_compute
-- cluster.virtual-mcp-ocata-ovs-dpdk
+  - system.nova.compute.nfv.hugepages
+  - system.neutron.compute.nfv.dpdk
+  - cluster.virtual-mcp-ocata-common.openstack_compute
+  - cluster.virtual-mcp-ocata-ovs-dpdk
 parameters:
   neutron:
     compute:
@@ -16,6 +17,7 @@ parameters:
     system:
       repo:
         uca:
+          # yamllint disable-line rule:line-length
           source: "deb http://ubuntu-cloud.archive.canonical.com/ubuntu xenial-updates/ocata main"
           architectures: amd64
           key_id: EC4926EA
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
index fb3f0e5d7..ba12a8be3 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/control.yml
@@ -1,7 +1,8 @@
+---
 classes:
-- system.neutron.control.openvswitch.single
-- cluster.virtual-mcp-ocata-common.openstack_control
-- cluster.virtual-mcp-ocata-ovs-dpdk
+  - system.neutron.control.openvswitch.single
+  - cluster.virtual-mcp-ocata-common.openstack_control
+  - cluster.virtual-mcp-ocata-ovs-dpdk
 parameters:
   neutron:
     server:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml
index 96af8cbd9..b2b007486 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/gateway.yml
@@ -1,7 +1,8 @@
+---
 classes:
-- cluster.virtual-mcp-ocata-common.openstack_gateway
-- service.neutron.gateway.single
-- cluster.virtual-mcp-ocata-ovs-dpdk
+  - cluster.virtual-mcp-ocata-common.openstack_gateway
+  - service.neutron.gateway.single
+  - cluster.virtual-mcp-ocata-ovs-dpdk
 parameters:
   neutron:
     gateway:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
index 14501050f..c2e1f08d3 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs-dpdk/openstack/init.yml
@@ -1,5 +1,6 @@
+---
 classes:
-- cluster.virtual-mcp-ocata-common.openstack_init
+  - cluster.virtual-mcp-ocata-common.openstack_init
 parameters:
   _param:
     neutron_tenant_network_types: "flat,vlan"
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
index c366ec502..657892100 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/infra/config.yml
@@ -1,3 +1,4 @@
+---
 classes:
-- cluster.virtual-mcp-ocata-common.infra.config
-- cluster.virtual-mcp-ocata-ovs
+  - cluster.virtual-mcp-ocata-common.infra.config
+  - cluster.virtual-mcp-ocata-ovs
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml
index b6ff33202..56c7a498a 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/init.yml
@@ -1,9 +1,10 @@
+---
 classes:
-- system.linux.system.single
-- cluster.all-mcp-ocata-common
-- cluster.virtual-mcp-ocata-common.init_options
-- cluster.virtual-mcp-ocata-common.infra
-- cluster.virtual-mcp-ocata-ovs.openstack
+  - system.linux.system.single
+  - cluster.all-mcp-ocata-common
+  - cluster.virtual-mcp-ocata-common.init_options
+  - cluster.virtual-mcp-ocata-common.infra
+  - cluster.virtual-mcp-ocata-ovs.openstack
 
 parameters:
   _param:
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
index a53d4e923..80007a444 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/compute.yml
@@ -1,6 +1,7 @@
+---
 classes:
-- cluster.virtual-mcp-ocata-common.openstack_compute
-- cluster.virtual-mcp-ocata-ovs
+  - cluster.virtual-mcp-ocata-common.openstack_compute
+  - cluster.virtual-mcp-ocata-ovs
 parameters:
   linux:
     network:
@@ -12,4 +13,4 @@ parameters:
           address: ${_param:tenant_address}
           netmask: 255.255.255.0
           use_interfaces:
-          - ${_param:tenant_interface}
+            - ${_param:tenant_interface}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
index 7e8f5dcdc..516673f24 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/control.yml
@@ -1,4 +1,5 @@
+---
 classes:
-- system.neutron.control.openvswitch.single
-- cluster.virtual-mcp-ocata-common.openstack_control
-- cluster.virtual-mcp-ocata-ovs
+  - system.neutron.control.openvswitch.single
+  - cluster.virtual-mcp-ocata-common.openstack_control
+  - cluster.virtual-mcp-ocata-ovs
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
index f6f58066b..52dc07769 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/gateway.yml
@@ -1,7 +1,8 @@
+---
 classes:
-- cluster.virtual-mcp-ocata-common.openstack_gateway
-- service.neutron.gateway.single
-- cluster.virtual-mcp-ocata-ovs
+  - cluster.virtual-mcp-ocata-common.openstack_gateway
+  - service.neutron.gateway.single
+  - cluster.virtual-mcp-ocata-ovs
 parameters:
   linux:
     network:
@@ -14,4 +15,4 @@ parameters:
           address: ${_param:tenant_address}
           netmask: 255.255.255.0
           use_interfaces:
-          - ${_param:tenant_interface}
+            - ${_param:tenant_interface}
diff --git a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
index f8f01298c..cdca65e85 100644
--- a/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
+++ b/mcp/reclass/classes/cluster/virtual-mcp-ocata-ovs/openstack/init.yml
@@ -1,5 +1,6 @@
+---
 classes:
-- cluster.virtual-mcp-ocata-common.openstack_init
+  - cluster.virtual-mcp-ocata-common.openstack_init
 parameters:
   _param:
     neutron_tenant_network_types: "flat,vxlan"
diff --git a/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-odl-ha.local.yml b/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-odl-ha.local.yml
index 73b3b6d07..ff89dfb9d 100644
--- a/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-odl-ha.local.yml
+++ b/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-odl-ha.local.yml
@@ -1,5 +1,6 @@
+---
 classes:
-- cluster.baremetal-mcp-ocata-odl-ha.infra.config
+  - cluster.baremetal-mcp-ocata-odl-ha.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
diff --git a/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-dpdk-ha.local.yml b/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-dpdk-ha.local.yml
index 86a5607f6..e9b82cd6e 100644
--- a/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-dpdk-ha.local.yml
+++ b/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-dpdk-ha.local.yml
@@ -1,5 +1,6 @@
+---
 classes:
-- cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra.config
+  - cluster.baremetal-mcp-ocata-ovs-dpdk-ha.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
diff --git a/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-ha.local.yml b/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-ha.local.yml
index 468557dad..c52da4043 100644
--- a/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-ha.local.yml
+++ b/mcp/reclass/nodes/cfg01.baremetal-mcp-ocata-ovs-ha.local.yml
@@ -1,5 +1,6 @@
+---
 classes:
-- cluster.baremetal-mcp-ocata-ovs-ha.infra.config
+  - cluster.baremetal-mcp-ocata-ovs-ha.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router.local.yml
index 62e563fd3..a8bf2ea74 100644
--- a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router.local.yml
+++ b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl-router.local.yml
@@ -1,5 +1,6 @@
+---
 classes:
-- cluster.virtual-mcp-ocata-odl-router.infra.config
+  - cluster.virtual-mcp-ocata-odl-router.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl.local.yml
index 4e168e416..521da211f 100644
--- a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl.local.yml
+++ b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-odl.local.yml
@@ -1,5 +1,6 @@
+---
 classes:
-- cluster.virtual-mcp-ocata-odl.infra.config
+  - cluster.virtual-mcp-ocata-odl.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk.local.yml
index f7a13bbe4..abf2aee99 100644
--- a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk.local.yml
+++ b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs-dpdk.local.yml
@@ -1,5 +1,6 @@
+---
 classes:
-- cluster.virtual-mcp-ocata-ovs-dpdk.infra.config
+  - cluster.virtual-mcp-ocata-ovs-dpdk.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
diff --git a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs.local.yml b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs.local.yml
index 43202d6d2..08f80fb8b 100644
--- a/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs.local.yml
+++ b/mcp/reclass/nodes/cfg01.virtual-mcp-ocata-ovs.local.yml
@@ -1,5 +1,6 @@
+---
 classes:
-- cluster.virtual-mcp-ocata-ovs.infra.config
+  - cluster.virtual-mcp-ocata-ovs.infra.config
 parameters:
   _param:
     linux_system_codename: xenial
diff --git a/mcp/scripts/lib.sh b/mcp/scripts/lib.sh
index 650c63b16..4b88ab7bb 100644
--- a/mcp/scripts/lib.sh
+++ b/mcp/scripts/lib.sh
@@ -176,7 +176,7 @@ parse_yaml() {
   s='[[:space:]]*'
   w='[a-zA-Z0-9_]*'
   fs="$(echo @|tr @ '\034')"
-  sed -ne "s|^\($s\)\($w\)$s:$s\"\(.*\)\"$s\$|\1$fs\2$fs\3|p" \
+  sed -e 's|---||g' -ne "s|^\($s\)\($w\)$s:$s\"\(.*\)\"$s\$|\1$fs\2$fs\3|p" \
       -e "s|^\($s\)\($w\)$s[:-]$s\(.*\)$s\$|\1$fs\2$fs\3|p" "$1" |
   awk -F"$fs" '{
   indent = length($1)/2;
author	Alexandru Avadanii <Alexandru.Avadanii@enea.com>	2017-09-25 04:36:02 +0200
committer	Alexandru Avadanii <Alexandru.Avadanii@enea.com>	2017-09-26 00:40:22 +0000
commit	53282e13c6c3937f5a3b9e91e72104252a38762f (patch)
tree	09c49c53a35b06ace30e0ca46bb6a896a52032de /mcp
parent	91a3426ee125951d54d7e80ee8c133168221fcba (diff)