From 98fefe04035cec99ccff3be8ebe4085fba61b679 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Wed, 24 Jan 2018 23:39:38 +0100 Subject: [joid] 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: Ia8925261bc8242cbfd195f1d09bb61121b3fdacf Signed-off-by: Alexandru Avadanii --- config/installers/joid/pod_config.yaml.j2 | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'config') diff --git a/config/installers/joid/pod_config.yaml.j2 b/config/installers/joid/pod_config.yaml.j2 index e18ba86f..61604a24 100644 --- a/config/installers/joid/pod_config.yaml.j2 +++ b/config/installers/joid/pod_config.yaml.j2 @@ -31,10 +31,10 @@ lab: spaces: [admin] mac: ["{{ conf['nodes'][0]['interfaces'][2]['mac_address'] }}"] power: - type: {{ conf['jumphost']['remote_params']['type'] }} + type: {{ conf['nodes'][0]['remote_management']['type'] }} address: {{ conf['nodes'][0]['remote_management']['address'] }} - user: {{ conf['jumphost']['remote_params']['user'] }} - pass: {{ conf['jumphost']['remote_params']['pass'] }} + user: {{ conf['nodes'][0]['remote_management']['user'] }} + pass: {{ conf['nodes'][0]['remote_management']['pass'] }} - name: {{ conf['nodes'][1]['name'] }} architecture: {{ conf['nodes'][1]['node']['arch'] }} roles: [compute, control, storage] @@ -55,10 +55,10 @@ lab: spaces: [admin] mac: ["{{ conf['nodes'][1]['interfaces'][2]['mac_address'] }}"] power: - type: {{ conf['jumphost']['remote_params']['type'] }} + type: {{ conf['nodes'][1]['remote_management']['type'] }} address: {{ conf['nodes'][1]['remote_management']['address'] }} - user: {{ conf['jumphost']['remote_params']['user'] }} - pass: {{ conf['jumphost']['remote_params']['pass'] }} + user: {{ conf['nodes'][1]['remote_management']['user'] }} + pass: {{ conf['nodes'][1]['remote_management']['pass'] }} - name: {{ conf['nodes'][2]['name'] }} architecture: {{ conf['nodes'][2]['node']['arch'] }} roles: [compute, control, storage] @@ -77,10 +77,10 @@ lab: mac: ["{{ conf['nodes'][2]['interfaces'][1]['mac_address'] }}"] - ifname: {{ conf['nodes'][2]['interfaces'][2]['name'] }} power: - type: {{ conf['jumphost']['remote_params']['type'] }} + type: {{ conf['nodes'][2]['remote_management']['type'] }} address: {{ conf['nodes'][2]['remote_management']['address'] }} - user: {{ conf['jumphost']['remote_params']['user'] }} - pass: {{ conf['jumphost']['remote_params']['pass'] }} + user: {{ conf['nodes'][2]['remote_management']['user'] }} + pass: {{ conf['nodes'][2]['remote_management']['pass'] }} - name: {{ conf['nodes'][3]['name'] }} architecture: {{ conf['nodes'][3]['node']['arch'] }} roles: [compute, storage] @@ -99,10 +99,10 @@ lab: mac: ["{{ conf['nodes'][3]['interfaces'][1]['mac_address'] }}"] - ifname: {{ conf['nodes'][3]['interfaces'][2]['name'] }} power: - type: ipmi + type: {{ conf['nodes'][3]['remote_management']['type'] }} address: {{ conf['nodes'][3]['remote_management']['address'] }} - user: {{ conf['jumphost']['remote_params']['user'] }} - pass: {{ conf['jumphost']['remote_params']['pass'] }} + user: {{ conf['nodes'][3]['remote_management']['user'] }} + pass: {{ conf['nodes'][3]['remote_management']['pass'] }} - name: {{ conf['nodes'][4]['name'] }} architecture: {{ conf['nodes'][4]['node']['arch'] }} roles: [compute, storage] @@ -121,10 +121,10 @@ lab: mac: ["{{ conf['nodes'][4]['interfaces'][1]['mac_address'] }}"] - ifname: {{ conf['nodes'][1]['interfaces'][2]['name'] }} power: - type: {{ conf['jumphost']['remote_params']['type'] }} + type: {{ conf['nodes'][4]['remote_management']['type'] }} address: {{ conf['nodes'][4]['remote_management']['address'] }} - user: {{ conf['jumphost']['remote_params']['user'] }} - pass: {{ conf['jumphost']['remote_params']['pass'] }} + user: {{ conf['nodes'][4]['remote_management']['user'] }} + pass: {{ conf['nodes'][4]['remote_management']['pass'] }} floating-ip-range: 10.5.15.6,10.5.15.250,10.5.15.1,10.5.15.0/24 ext-port: "ens785f0.505" dns: 8.8.8.8 -- cgit 1.2.3-korg