From: Jack Morgan <jack.morgan@intel.com>
Date: Thu, 14 Dec 2017 01:10:58 +0000 (+0000)
Subject: Merge "[fuel] IPMI: Trim netmask from IP passed to MaaS" into stable/euphrates
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=7d5c9adb99dafcb4d205e360e6175b0aae23dd69;p=pharos.git

Merge "[fuel] IPMI: Trim netmask from IP passed to MaaS" into stable/euphrates
---

7d5c9adb99dafcb4d205e360e6175b0aae23dd69
diff --cc config/installers/fuel/pod_config.yml.j2
index 73035129,cd9a6ba5..04be321e
--- a/config/installers/fuel/pod_config.yml.j2
+++ b/config/installers/fuel/pod_config.yml.j2
@@@ -84,31 -83,31 +84,31 @@@ 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_address: {{ conf['nodes'][1]['remote_management']['address'].rsplit('/')[0] }}
      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_address: {{ conf['nodes'][2]['remote_management']['address'].rsplit('/')[0] }}
      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_address: {{ conf['nodes'][3]['remote_management']['address'].rsplit('/')[0] }}
      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_address: {{ conf['nodes'][4]['remote_management']['address'].rsplit('/')[0] }}
      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'] }}