From d67405495e8e8da1ccd02b1f9034e3807adbe9fe Mon Sep 17 00:00:00 2001 From: Guillermo Herrero Date: Wed, 27 Sep 2017 15:23:16 +0200 Subject: Updated fuel adapter (vlan1000, interfaces format) Change-Id: I848f13acca08c4c8a24eeecd3554ea6d50bbb565 Signed-off-by: Guillermo Herrero (cherry picked from commit 908dab58edbbe8f22db14a9261693a54e9b2d8fd) --- config/installers/fuel/pod_config.yml.j2 | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2 index 370a3b95..8ef23037 100644 --- a/config/installers/fuel/pod_config.yml.j2 +++ b/config/installers/fuel/pod_config.yml.j2 @@ -11,7 +11,7 @@ {%- set net_private = '10.1.0.0' -%} {%- set net_public = '172.30.10.0' -%} {%- set vlan_mgmt = '300' -%} - {%- set vlan_private = '302' -%} + {%- set vlan_private = '1000' -%} {%- endif -%} {%- if conf.net_config.public.dns is defined -%} @@ -20,6 +20,7 @@ {%- set dns_public = [ '8.8.8.8', '8.8.4.4' ] -%} {%- endif -%} +{%- set pxe_interface = 0 -%} --- parameters: _param: @@ -83,32 +84,32 @@ parameters: opnfv_maas_node01_power_type: {{ conf['nodes'][0]['remote_management']['type'] }} opnfv_maas_node01_power_user: {{ conf['nodes'][0]['remote_management']['user'] }} opnfv_maas_node01_power_password: {{ conf['nodes'][0]['remote_management']['pass'] }} - opnfv_maas_node01_interface_mac: '{{ conf['nodes'][0]['interfaces'][1] }}' + opnfv_maas_node01_interface_mac: '{{ conf['nodes'][0]['interfaces'][pxe_interface]['mac_address'] }}' opnfv_maas_node02_architecture: '{{ conf['nodes'][1]['node']['arch'] | dpkg_arch }}/generic' opnfv_maas_node02_power_address: {{ conf['nodes'][1]['remote_management']['address'] }} opnfv_maas_node02_power_type: {{ conf['nodes'][1]['remote_management']['type'] }} opnfv_maas_node02_power_user: {{ conf['nodes'][1]['remote_management']['user'] }} opnfv_maas_node02_power_password: {{ conf['nodes'][1]['remote_management']['pass'] }} - opnfv_maas_node02_interface_mac: '{{ conf['nodes'][1]['interfaces'][1] }}' + opnfv_maas_node02_interface_mac: '{{ conf['nodes'][1]['interfaces'][pxe_interface]['mac_address'] }}' opnfv_maas_node03_architecture: '{{ conf['nodes'][2]['node']['arch'] | dpkg_arch }}/generic' opnfv_maas_node03_power_address: {{ conf['nodes'][2]['remote_management']['address'] }} opnfv_maas_node03_power_type: {{ conf['nodes'][2]['remote_management']['type'] }} opnfv_maas_node03_power_user: {{ conf['nodes'][2]['remote_management']['user'] }} opnfv_maas_node03_power_password: {{ conf['nodes'][2]['remote_management']['pass'] }} - opnfv_maas_node03_interface_mac: '{{ conf['nodes'][2]['interfaces'][1] }}' + opnfv_maas_node03_interface_mac: '{{ conf['nodes'][2]['interfaces'][pxe_interface]['mac_address'] }}' opnfv_maas_node04_architecture: '{{ conf['nodes'][3]['node']['arch'] | dpkg_arch }}/generic' opnfv_maas_node04_power_address: {{ conf['nodes'][3]['remote_management']['address'] }} opnfv_maas_node04_power_type: {{ conf['nodes'][3]['remote_management']['type'] }} opnfv_maas_node04_power_user: {{ conf['nodes'][3]['remote_management']['user'] }} opnfv_maas_node04_power_password: {{ conf['nodes'][3]['remote_management']['pass'] }} - opnfv_maas_node04_interface_mac: '{{ conf['nodes'][3]['interfaces'][1] }}' + opnfv_maas_node04_interface_mac: '{{ conf['nodes'][3]['interfaces'][pxe_interface]['mac_address'] }}' opnfv_maas_node05_architecture: '{{ conf['nodes'][4]['node']['arch'] | dpkg_arch }}/generic' opnfv_maas_node05_power_address: {{ conf['nodes'][4]['remote_management']['address'] }} opnfv_maas_node05_power_type: {{ conf['nodes'][4]['remote_management']['type'] }} opnfv_maas_node05_power_user: {{ conf['nodes'][4]['remote_management']['user'] }} opnfv_maas_node05_power_password: {{ conf['nodes'][4]['remote_management']['pass'] }} - opnfv_maas_node05_interface_mac: '{{ conf['nodes'][4]['interfaces'][1] }}' + opnfv_maas_node05_interface_mac: '{{ conf['nodes'][4]['interfaces'][pxe_interface]['mac_address'] }}' -- cgit 1.2.3-korg