diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/installers/daisy/network-dpdk.yaml.j2 | 9 | ||||
| -rw-r--r-- | config/installers/daisy/network.yaml.j2 | 9 | ||||
| -rw-r--r-- | config/pdf/pod1.encrypted.yaml | 4 | ||||
| -rw-r--r-- | config/pdf/pod1.yaml | 4 |
4 files changed, 20 insertions, 6 deletions
diff --git a/config/installers/daisy/network-dpdk.yaml.j2 b/config/installers/daisy/network-dpdk.yaml.j2 index 507e7cfc..ccd7c8c5 100644 --- a/config/installers/daisy/network-dpdk.yaml.j2 +++ b/config/installers/daisy/network-dpdk.yaml.j2 @@ -41,6 +41,7 @@ network-config-metadata: networks: + {%- set nodes_num = conf['nodes'] | length -%} {%- set networks = {} -%} {%- for key in mapping -%} {%- set net_data = conf['net_config'][mapping[key]] -%} @@ -61,7 +62,9 @@ networks: {%- set start = ".".join([ips[0], ips[1], ips[2], "10"]) -%} {%- set end = ".".join([ips[0], ips[1], ips[2], "200"]) -%} {%- endif -%} - {%- set vip = start -%} + {%- set vip = start.split(".")[3] | int -%} + {%- set vip = vip + nodes_num + 10 - (vip + nodes_num) % 10 -%} + {%- set vip = ".".join([ips[0], ips[1], ips[2], vip | string]) -%} {%- if 'gateway' in net_data -%} {%- set gateway = net_data.gateway -%} @@ -88,6 +91,10 @@ networks: 'end': '{{ end }}' vlan_id: {{ vlan }} name: '{{ key }}' + {%- if key == 'EXTERNAL' %} + network_name: 'admin_external' + mapping: 'physnet1' + {%- endif -%} {%- endfor %} interfaces: diff --git a/config/installers/daisy/network.yaml.j2 b/config/installers/daisy/network.yaml.j2 index 9eef7390..914df461 100644 --- a/config/installers/daisy/network.yaml.j2 +++ b/config/installers/daisy/network.yaml.j2 @@ -41,6 +41,7 @@ network-config-metadata: networks: + {%- set nodes_num = conf['nodes'] | length -%} {%- set networks = {} -%} {%- for key in mapping -%} {%- set net_data = conf['net_config'][mapping[key]] -%} @@ -61,7 +62,9 @@ networks: {%- set start = ".".join([ips[0], ips[1], ips[2], "10"]) -%} {%- set end = ".".join([ips[0], ips[1], ips[2], "200"]) -%} {%- endif -%} - {%- set vip = start -%} + {%- set vip = start.split(".")[3] | int -%} + {%- set vip = vip + nodes_num + 10 - (vip + nodes_num) % 10 -%} + {%- set vip = ".".join([ips[0], ips[1], ips[2], vip | string]) -%} {%- if 'gateway' in net_data -%} {%- set gateway = net_data.gateway -%} @@ -88,6 +91,10 @@ networks: 'end': '{{ end }}' vlan_id: {{ vlan }} name: '{{ key }}' + {%- if key == 'EXTERNAL' %} + network_name: 'admin_external' + mapping: 'physnet1' + {%- endif -%} {%- endfor %} interfaces: diff --git a/config/pdf/pod1.encrypted.yaml b/config/pdf/pod1.encrypted.yaml index 31548ea2..8693647d 100644 --- a/config/pdf/pod1.encrypted.yaml +++ b/config/pdf/pod1.encrypted.yaml @@ -19,7 +19,7 @@ jumphost: arch: {x86_64|aarch64} cpus: 2 # add values based on CFLAGS in GCC - cpu_cflags: {broadwell|hasewell|etc} + cpu_cflags: {broadwell|haswell|etc} # physical cores, not including hyper-threads cores: 10 memory: 32G @@ -96,7 +96,7 @@ nodes: model: S2600JF arch: x86_64 cpus: 2 - cpu_cflags: hasewell + cpu_cflags: haswell cores: 12 memory: 128G # for nodes in the same pod may have the same configuration diff --git a/config/pdf/pod1.yaml b/config/pdf/pod1.yaml index 77533bb2..d9028c23 100644 --- a/config/pdf/pod1.yaml +++ b/config/pdf/pod1.yaml @@ -19,7 +19,7 @@ jumphost: arch: {x86_64|aarch64} cpus: 2 # add values based on CFLAGS in GCC - cpu_cflags: {broadwell|hasewell|etc} + cpu_cflags: {broadwell|haswell|etc} # physical cores, not including hyper-threads cores: 10 memory: 32G @@ -77,7 +77,7 @@ nodes: model: S2600JF arch: x86_64 cpus: 2 - cpu_cflags: hasewell + cpu_cflags: haswell cores: 12 memory: 128G # for nodes in the same pod may have the same configuration |