Merge "Fix or silence all yamllint warnings"

1 files changed, 54 insertions, 53 deletions

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