mcp/patches/pharos/0003-IPMI-Trim-netmask-from-IP-passed-to-MaaS.patch

   1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   2 : Copyright (c) 2017 Mirantis Inc., Enea AB and others.
   3 :
   4 : All rights reserved. This program and the accompanying materials
   5 : are made available under the terms of the Apache License, Version 2.0
   6 : which accompanies this distribution, and is available at
   7 : http://www.apache.org/licenses/LICENSE-2.0
   8 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
   9 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  10 Date: Fri, 27 Oct 2017 19:17:37 +0200
  11 Subject: [PATCH] IPMI: Trim netmask from IP passed to MaaS
  12
  13 Change-Id: I683788846a716f1af6ae8aa3b25cc3a866ae0045
  14 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
  15 ---
  16  config/installers/fuel/pod_config.yml.j2 | 10 +++++-----
  17  1 file changed, 5 insertions(+), 5 deletions(-)
  18
  19 diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
  20 index 19e5d0d..890b380 100644
  21 --- a/config/installers/fuel/pod_config.yml.j2
  22 +++ b/config/installers/fuel/pod_config.yml.j2
  23 @@ -90,35 +90,35 @@ parameters:
  24      opnfv_net_tenant_vlan: {{ vlan_private }}
  25
  26      opnfv_maas_node01_architecture: '{{ conf['nodes'][0]['node']['arch'] | dpkg_arch }}/generic'
  27 -    opnfv_maas_node01_power_address: {{ conf['nodes'][0]['remote_management']['address'] }}
  28 +    opnfv_maas_node01_power_address: {{ conf['nodes'][0]['remote_management']['address'].rsplit('/')[0]}}
  29      opnfv_maas_node01_power_type: {{ conf['nodes'][0]['remote_management']['type'] }}
  30      opnfv_maas_node01_power_user: {{ conf['nodes'][0]['remote_management']['user'] }}
  31      opnfv_maas_node01_power_password: {{ conf['nodes'][0]['remote_management']['pass'] }}
  32      opnfv_maas_node01_interface_mac: '{{ conf['nodes'][0]['interfaces'][pxe_interface]['mac_address'] }}'
  33
  34      opnfv_maas_node02_architecture: '{{ conf['nodes'][1]['node']['arch'] | dpkg_arch }}/generic'
  35 -    opnfv_maas_node02_power_address: {{ conf['nodes'][1]['remote_management']['address'] }}
  36 +    opnfv_maas_node02_power_address: {{ conf['nodes'][1]['remote_management']['address'].rsplit('/')[0] }}
  37      opnfv_maas_node02_power_type: {{ conf['nodes'][1]['remote_management']['type'] }}
  38      opnfv_maas_node02_power_user: {{ conf['nodes'][1]['remote_management']['user'] }}
  39      opnfv_maas_node02_power_password: {{ conf['nodes'][1]['remote_management']['pass'] }}
  40      opnfv_maas_node02_interface_mac: '{{ conf['nodes'][1]['interfaces'][pxe_interface]['mac_address'] }}'
  41
  42      opnfv_maas_node03_architecture: '{{ conf['nodes'][2]['node']['arch'] | dpkg_arch }}/generic'
  43 -    opnfv_maas_node03_power_address: {{ conf['nodes'][2]['remote_management']['address'] }}
  44 +    opnfv_maas_node03_power_address: {{ conf['nodes'][2]['remote_management']['address'].rsplit('/')[0] }}
  45      opnfv_maas_node03_power_type: {{ conf['nodes'][2]['remote_management']['type'] }}
  46      opnfv_maas_node03_power_user: {{ conf['nodes'][2]['remote_management']['user'] }}
  47      opnfv_maas_node03_power_password: {{ conf['nodes'][2]['remote_management']['pass'] }}
  48      opnfv_maas_node03_interface_mac: '{{ conf['nodes'][2]['interfaces'][pxe_interface]['mac_address'] }}'
  49
  50      opnfv_maas_node04_architecture: '{{ conf['nodes'][3]['node']['arch'] | dpkg_arch }}/generic'
  51 -    opnfv_maas_node04_power_address: {{ conf['nodes'][3]['remote_management']['address'] }}
  52 +    opnfv_maas_node04_power_address: {{ conf['nodes'][3]['remote_management']['address'].rsplit('/')[0] }}
  53      opnfv_maas_node04_power_type: {{ conf['nodes'][3]['remote_management']['type'] }}
  54      opnfv_maas_node04_power_user: {{ conf['nodes'][3]['remote_management']['user'] }}
  55      opnfv_maas_node04_power_password: {{ conf['nodes'][3]['remote_management']['pass'] }}
  56      opnfv_maas_node04_interface_mac: '{{ conf['nodes'][3]['interfaces'][pxe_interface]['mac_address'] }}'
  57
  58      opnfv_maas_node05_architecture: '{{ conf['nodes'][4]['node']['arch'] | dpkg_arch }}/generic'
  59 -    opnfv_maas_node05_power_address: {{ conf['nodes'][4]['remote_management']['address'] }}
  60 +    opnfv_maas_node05_power_address: {{ conf['nodes'][4]['remote_management']['address'].rsplit('/')[0] }}
  61      opnfv_maas_node05_power_type: {{ conf['nodes'][4]['remote_management']['type'] }}
  62      opnfv_maas_node05_power_user: {{ conf['nodes'][4]['remote_management']['user'] }}
  63      opnfv_maas_node05_power_password: {{ conf['nodes'][4]['remote_management']['pass'] }}