Merge "generate_config: Add netmask jinja filter"

[pharos.git] / config / installers / daisy / pod_config.yaml.j2

diff --git a/config/installers/daisy/pod_config.yaml.j2 b/config/installers/daisy/pod_config.yaml.j2
index 776d2ec..30147a5 100644 (file)
--- a/config/installers/daisy/pod_config.yaml.j2
+++ b/config/installers/daisy/pod_config.yaml.j2
@@ -1,5 +1,5 @@
 ##############################################################################
-# Copyright (c) 2017 ZTE Corporation and others.
+# Copyright (c) 2018 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
@@ -11,6 +11,8 @@
 
 adapter: {{ conf['jumphost']['remote_params']['type'] }}
 hosts:
+  {%- set nodes_num = conf['nodes'] | length -%}
+  {%- if nodes_num == 5 %}
   - name: 'controller01'
     roles:
       - 'CONTROLLER_LB'
@@ -51,12 +53,39 @@ hosts:
     ipmi_pass: {{ conf['nodes'][4]['remote_management']['pass'] }}
     mac_addresses:{% for nic in conf['nodes'][4]['interfaces'] %}
       - {{ nic['mac_address'] }}{% endfor %}
+  {%- endif %}
+  {%- if nodes_num == 3 %}
+  - 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: 'computer01'
+    roles:
+      - 'COMPUTER'
+    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: 'computer02'
+    roles:
+      - 'COMPUTER'
+    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 %}
+  {%- endif %}
 disks:
   daisy: 50
 daisy_passwd: 'r00tme'
 {% if 'fixed_ips' in conf['jumphost'] -%}
 daisy_gateway: {{ conf['jumphost']['fixed_ips']['admin'] }}
 {%- else -%}
-daisy_gateway: {{ conf['jumphost']['interfaces'][0]['address'][0] }}
+daisy_gateway: {{ conf['jumphost']['interfaces'][0]['address'] }}
 {%- endif %}
 ceph_disk_name: '/dev/sdb'