From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Fri, 19 Jan 2018 01:58:04 +0000 (+0100)
Subject: [apex] Use node remote_management params
X-Git-Tag: 6.0.0~25^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F07%2F50807%2F1;p=pharos.git

[apex] Use node remote_management params

Previously, we relied on jumpserver IPMI user/pass/type to be the
same for all nodes (including jumpserver).
Instead, read node-specific params and stop relying on
'remote_params' optional YAML anchor.

Change-Id: Id64a0c4350481a6c81212a4559115bb9b1a0155e
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---

diff --git a/config/installers/apex/pod_config.yaml.j2 b/config/installers/apex/pod_config.yaml.j2
index b681215e..aeb72a24 100644
--- a/config/installers/apex/pod_config.yaml.j2
+++ b/config/installers/apex/pod_config.yaml.j2
@@ -3,9 +3,9 @@ nodes:
   node1:
     mac_address: "{{ conf['nodes'][0]['remote_management']['mac_address'] }}"
     ipmi_ip: {{ conf['nodes'][0]['remote_management']['address'] }}
-    ipmi_user: {{ conf['jumphost']['remote_params']['user'] }}
-    ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }}
-    pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool"
+    ipmi_user: {{ conf['nodes'][0]['remote_management']['user'] }}
+    ipmi_pass: {{ conf['nodes'][0]['remote_management']['pass'] }}
+    pm_type: "pxe_{{ conf['nodes'][0]['remote_management']['type'] }}tool"
     cpus: {{ conf['nodes'][0]['node']['cpus'] }}
     memory: {{ conf['nodes'][0]['node']['memory'] }}
     disk: 40
@@ -15,9 +15,9 @@ nodes:
   node2:
     mac_address: "{{ conf['nodes'][1]['remote_management']['mac_address'] }}"
     ipmi_ip: {{ conf['nodes'][1]['remote_management']['address'] }}
-    ipmi_user: {{ conf['jumphost']['remote_params']['user'] }}
-    ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }}
-    pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool"
+    ipmi_user: {{ conf['nodes'][1]['remote_management']['user'] }}
+    ipmi_pass: {{ conf['nodes'][1]['remote_management']['pass'] }}
+    pm_type: "pxe_{{ conf['nodes'][1]['remote_management']['type'] }}tool"
     cpus: {{ conf['nodes'][1]['node']['cpus'] }}
     memory: {{ conf['nodes'][1]['node']['memory'] }}
     disk: 40
@@ -27,9 +27,9 @@ nodes:
   node3:
     mac_address: "{{ conf['nodes'][2]['remote_management']['mac_address'] }}"
     ipmi_ip: {{ conf['nodes'][2]['remote_management']['address'] }}
-    ipmi_user: {{ conf['jumphost']['remote_params']['user'] }}
-    ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }}
-    pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool"
+    ipmi_user: {{ conf['nodes'][2]['remote_management']['user'] }}
+    ipmi_pass: {{ conf['nodes'][2]['remote_management']['pass'] }}
+    pm_type: "pxe_{{ conf['nodes'][2]['remote_management']['type'] }}tool"
     cpus: {{ conf['nodes'][2]['node']['cpus'] }}
     memory: {{ conf['nodes'][2]['node']['memory'] }}
     disk: 40
@@ -39,9 +39,9 @@ nodes:
   node4:
     mac_address: "{{ conf['nodes'][3]['remote_management']['mac_address'] }}"
     ipmi_ip: {{ conf['nodes'][3]['remote_management']['address'] }}
-    ipmi_user: {{ conf['jumphost']['remote_params']['user'] }}
-    ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }}
-    pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool"
+    ipmi_user: {{ conf['nodes'][3]['remote_management']['user'] }}
+    ipmi_pass: {{ conf['nodes'][3]['remote_management']['pass'] }}
+    pm_type: "pxe_{{ conf['nodes'][3]['remote_management']['type'] }}tool"
     cpus: {{ conf['nodes'][3]['node']['cpus'] }}
     memory: {{ conf['nodes'][3]['node']['memory'] }}
     disk: 40
@@ -51,9 +51,9 @@ nodes:
   node5:
     mac_address: "{{ conf['nodes'][4]['remote_management']['mac_address'] }}"
     ipmi_ip: {{ conf['nodes'][4]['remote_management']['address'] }}
-    ipmi_user: {{ conf['jumphost']['remote_params']['user'] }}
-    ipmi_pass: {{ conf['jumphost']['remote_params']['pass'] }}
-    pm_type: "pxe_{{ conf['jumphost']['remote_params']['type'] }}tool"
+    ipmi_user: {{ conf['nodes'][4]['remote_management']['user'] }}
+    ipmi_pass: {{ conf['nodes'][4]['remote_management']['pass'] }}
+    pm_type: "pxe_{{ conf['nodes'][4]['remote_management']['type'] }}tool"
     cpus: {{ conf['nodes'][4]['node']['cpus'] }}
     memory: {{ conf['nodes'][4]['node']['memory'] }}
     disk: 40