Merge "Fix or silence all yamllint warnings"

4 files changed, 34 insertions, 29 deletions

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}