summaryrefslogtreecommitdiffstats
path: root/mcp
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-27 19:21:40 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-10-27 17:59:47 +0000
commit389271f828486c77aec3cdd5a3405bb6d090d4b0 (patch)
tree8768271ddd445d98899deaea4058874d4339d9bf /mcp
parente71bd7124aea67df693d58dd8f534bf1ef8cb86c (diff)
patches: pharos: IPMI: Trim netmask from IP
ericsson-pod1 uses 'IP/netmask' format for IPMI IPs in its PDF, which is part of PDF spec, so update our installer adapter template accordingly. This change will be reverted once the patch is merged upstream in Pharos OPNFV git repo. Change-Id: Ie97177444f0445501fc0a7b131569ff1af6fee3c Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com> (cherry picked from commit 94b3833e4b8c3de58cecd673091015a4c8f1640c)
Diffstat (limited to 'mcp')
-rw-r--r--mcp/patches/pharos/0003-IPMI-Trim-netmask-from-IP-passed-to-MaaS.patch63
1 files changed, 63 insertions, 0 deletions
diff --git a/mcp/patches/pharos/0003-IPMI-Trim-netmask-from-IP-passed-to-MaaS.patch b/mcp/patches/pharos/0003-IPMI-Trim-netmask-from-IP-passed-to-MaaS.patch
new file mode 100644
index 000000000..0293b6e7a
--- /dev/null
+++ b/mcp/patches/pharos/0003-IPMI-Trim-netmask-from-IP-passed-to-MaaS.patch
@@ -0,0 +1,63 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2017 Mirantis Inc., Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+Date: Fri, 27 Oct 2017 19:17:37 +0200
+Subject: [PATCH] IPMI: Trim netmask from IP passed to MaaS
+
+Change-Id: I683788846a716f1af6ae8aa3b25cc3a866ae0045
+Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
+---
+ config/installers/fuel/pod_config.yml.j2 | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/config/installers/fuel/pod_config.yml.j2 b/config/installers/fuel/pod_config.yml.j2
+index 676ead3..36bbd96 100644
+--- a/config/installers/fuel/pod_config.yml.j2
++++ b/config/installers/fuel/pod_config.yml.j2
+@@ -90,35 +90,35 @@ parameters:
+ opnfv_net_tenant_vlan: {{ vlan_private }}
+
+ opnfv_maas_node01_architecture: '{{ conf['nodes'][0]['node']['arch'] | dpkg_arch }}/generic'
+- opnfv_maas_node01_power_address: {{ conf['nodes'][0]['remote_management']['address'] }}
++ opnfv_maas_node01_power_address: {{ conf['nodes'][0]['remote_management']['address'].rsplit('/')[0]}}
+ 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'][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'][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'][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'][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'] }}