From: David Blaisonneau <david.blaisonneau@orange.com>
Date: Tue, 9 Aug 2016 09:32:23 +0000 (+0200)
Subject: correct maas-nodes templates when node architecture is not defined
X-Git-Tag: colorado.1.0~38
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F09%2F18209%2F1;p=joid.git

correct maas-nodes templates when node architecture is not defined

Signed-off-by: David Blaisonneau <david.blaisonneau@orange.com>
---

diff --git a/ci/config_tpl/maas_tpl/maas-nodes.yaml b/ci/config_tpl/maas_tpl/maas-nodes.yaml
index 4b5a0ce0..dc341851 100644
--- a/ci/config_tpl/maas_tpl/maas-nodes.yaml
+++ b/ci/config_tpl/maas_tpl/maas-nodes.yaml
@@ -1,13 +1,13 @@
 {% for node in lab.racks[0].nodes %}
-{% if node.architecture=='x86_64' %}
-    - architecture: amd64/generic
-{% endif %}
-      interfaces:
+    - interfaces:
 {% for nic in node.nics %}
       - mac_address: {{ nic.mac[0] }}
         mode: auto
         name: {{ nic.ifname }}
 {% endfor %}
+{% if node.architecture=='x86_64' %}
+      architecture: amd64/generic
+{% endif %}
       mac_addresses:
 {% for nic in node.nics %}
       - {{ nic.mac[0] }}