Merge "ha, noha: Fix Horizon stale cache after install" into stable/iruya

[fuel.git] / mcp / reclass / classes / cluster / mcp-odl-ha / infra / kvm.yml.j2

diff --git a/mcp/reclass/classes/cluster/mcp-odl-ha/infra/kvm.yml.j2 b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/kvm.yml.j2
index ab0da39..9ff0919 100644 (file)
--- a/mcp/reclass/classes/cluster/mcp-odl-ha/infra/kvm.yml.j2
+++ b/mcp/reclass/classes/cluster/mcp-odl-ha/infra/kvm.yml.j2
@@ -5,6 +5,7 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
+{%- import 'net_map.j2' as nm with context %}
 ---
 {%- if conf.MCP_VCP %}
 # NOTE(armband): we don't want to pull in salt.control for novcp
@@ -24,9 +25,19 @@ parameters:
       cluster:
         internal:
           node:
-            odl01:
-              name: ${_param:opendaylight_server_node01_hostname}
-              provider: ${_param:infra_kvm_node02_hostname}.${_param:cluster_domain}
-              image: ${_param:salt_control_xenial_image}
+  {%- for i in range(1, 4) %}
+            odl0{{ i }}:
+              name: ${_param:opendaylight_server_node0{{ i }}_hostname}
+              provider: ${_param:infra_kvm_node0{{ i }}_hostname}.${_param:cluster_domain}
+              image: ${_param:salt_control_bionic_image}
               size: opendaylight.server
+    {%- if conf.nodes[nm.ctl01.idx].node.arch == 'aarch64' %}
+              machine: virt
+              cpu_mode: host-passthrough
+              loader:
+                readonly: 'yes'
+                type: pflash
+                path: /usr/share/AAVMF/AAVMF_CODE.fd
+    {%- endif %}
+  {%- endfor %}
 {%- endif %}