From: Alex Yang <yangyang1@zte.com.cn>
Date: Mon, 20 Nov 2017 07:10:42 +0000 (+0800)
Subject: Fix yamllint warning for daisy template
X-Git-Tag: 6.0.0~78
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=9dc4b8a7ce78de4b71457841e23dd2120e995c06;p=pharos.git

Fix yamllint warning for daisy template

Change-Id: I4b9a9a569d22570f027a49bc31736f6787177171
Signed-off-by: Alex Yang <yangyang1@zte.com.cn>
---

diff --git a/config/installers/daisy/pod_config.yaml.j2 b/config/installers/daisy/pod_config.yaml.j2
index 9a4ac7b5..776d2ecf 100644
--- a/config/installers/daisy/pod_config.yaml.j2
+++ b/config/installers/daisy/pod_config.yaml.j2
@@ -1,45 +1,56 @@
+##############################################################################
+# Copyright (c) 2017 ZTE Corporation and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+---
+
 adapter: {{ conf['jumphost']['remote_params']['type'] }}
 hosts:
-- name: 'controller01'
-  roles:
-    - 'CONTROLLER_LB'
-  ipmi_ip: {{ conf['nodes'][0]['remote_management']['address'] }}
-  ipmi_user: {{ conf['nodes'][0]['remote_management']['user'] }}
-  ipmi_pass: {{ conf['nodes'][0]['remote_management']['pass'] }}
-  mac_addresses:{% for nic in conf['nodes'][0]['interfaces'] %}
-    - {{ nic['mac_address'] }}{% endfor %}
-- name: 'controller02'
-  roles:
-    - 'CONTROLLER_LB'
-  ipmi_ip: {{ conf['nodes'][1]['remote_management']['address'] }}
-  ipmi_user: {{ conf['nodes'][1]['remote_management']['user'] }}
-  ipmi_pass: {{ conf['nodes'][1]['remote_management']['pass'] }}
-  mac_addresses:{% for nic in conf['nodes'][1]['interfaces'] %}
-    - {{ nic['mac_address'] }}{% endfor %}
-- name: 'controller03'
-  roles:
-    - 'CONTROLLER_LB'
-  ipmi_ip: {{ conf['nodes'][2]['remote_management']['address'] }}
-  ipmi_user: {{ conf['nodes'][2]['remote_management']['user'] }}
-  ipmi_pass: {{ conf['nodes'][2]['remote_management']['pass'] }}
-  mac_addresses:{% for nic in conf['nodes'][2]['interfaces'] %}
-    - {{ nic['mac_address'] }}{% endfor %}
-- name: 'computer01'
-  roles:
-    - 'COMPUTER'
-  ipmi_ip: {{ conf['nodes'][3]['remote_management']['address'] }}
-  ipmi_user: {{ conf['nodes'][3]['remote_management']['user'] }}
-  ipmi_pass: {{ conf['nodes'][3]['remote_management']['pass'] }}
-  mac_addresses:{% for nic in conf['nodes'][3]['interfaces'] %}
-    - {{ nic['mac_address'] }}{% endfor %}
-- name: 'computer02'
-  roles:
-    - 'COMPUTER'
-  ipmi_ip: {{ conf['nodes'][4]['remote_management']['address'] }}
-  ipmi_user: {{ conf['nodes'][4]['remote_management']['user'] }}
-  ipmi_pass: {{ conf['nodes'][4]['remote_management']['pass'] }}
-  mac_addresses:{% for nic in conf['nodes'][4]['interfaces'] %}
-    - {{ nic['mac_address'] }}{% endfor %}
+  - name: 'controller01'
+    roles:
+      - 'CONTROLLER_LB'
+    ipmi_ip: {{ conf['nodes'][0]['remote_management']['address'] }}
+    ipmi_user: {{ conf['nodes'][0]['remote_management']['user'] }}
+    ipmi_pass: {{ conf['nodes'][0]['remote_management']['pass'] }}
+    mac_addresses:{% for nic in conf['nodes'][0]['interfaces'] %}
+      - {{ nic['mac_address'] }}{% endfor %}
+  - name: 'controller02'
+    roles:
+      - 'CONTROLLER_LB'
+    ipmi_ip: {{ conf['nodes'][1]['remote_management']['address'] }}
+    ipmi_user: {{ conf['nodes'][1]['remote_management']['user'] }}
+    ipmi_pass: {{ conf['nodes'][1]['remote_management']['pass'] }}
+    mac_addresses:{% for nic in conf['nodes'][1]['interfaces'] %}
+      - {{ nic['mac_address'] }}{% endfor %}
+  - name: 'controller03'
+    roles:
+      - 'CONTROLLER_LB'
+    ipmi_ip: {{ conf['nodes'][2]['remote_management']['address'] }}
+    ipmi_user: {{ conf['nodes'][2]['remote_management']['user'] }}
+    ipmi_pass: {{ conf['nodes'][2]['remote_management']['pass'] }}
+    mac_addresses:{% for nic in conf['nodes'][2]['interfaces'] %}
+      - {{ nic['mac_address'] }}{% endfor %}
+  - name: 'computer01'
+    roles:
+      - 'COMPUTER'
+    ipmi_ip: {{ conf['nodes'][3]['remote_management']['address'] }}
+    ipmi_user: {{ conf['nodes'][3]['remote_management']['user'] }}
+    ipmi_pass: {{ conf['nodes'][3]['remote_management']['pass'] }}
+    mac_addresses:{% for nic in conf['nodes'][3]['interfaces'] %}
+      - {{ nic['mac_address'] }}{% endfor %}
+  - name: 'computer02'
+    roles:
+      - 'COMPUTER'
+    ipmi_ip: {{ conf['nodes'][4]['remote_management']['address'] }}
+    ipmi_user: {{ conf['nodes'][4]['remote_management']['user'] }}
+    ipmi_pass: {{ conf['nodes'][4]['remote_management']['pass'] }}
+    mac_addresses:{% for nic in conf['nodes'][4]['interfaces'] %}
+      - {{ nic['mac_address'] }}{% endfor %}
 disks:
   daisy: 50
 daisy_passwd: 'r00tme'