Skip to content

Commit 070059a

Browse files
Merge pull request #794 from redhatci/use_bmc_names_when_defined
[vendors_dell] use bmc_name to name container when defined
2 parents a5cc5ea + 1e6b590 commit 070059a

File tree

4 files changed

+5
-3
lines changed

4 files changed

+5
-3
lines changed

roles/vendors/dell/defaults/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,3 +3,4 @@ boot_iso_url: "{{ discovery_iso_server }}/{{ discovery_iso_name }}"
33
bmc_address: "{{ hostvars[target_host]['bmc_address'] }}"
44
bmc_user: "{{ hostvars[target_host]['bmc_user'] }}"
55
bmc_password: "{{ hostvars[target_host]['bmc_password'] }}"
6+
bmc_name: "{{ (hostvars[target_host]['bmc_name'] | default('', true) | trim) | default(bmc_address, true) }}"

roles/vendors/dell/tasks/disk.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
- name: Discovery iDRAC versions for Dell hardware
33
containers.podman.podman_container:
4-
name: "{{ bmc_address }}-rac-version"
4+
name: "{{ bmc_name }}-rac-version"
55
network: host
66
image: quay.io/dphillip/racadm-image
77
state: started

roles/vendors/dell/tasks/iso.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
- name: Discovery iDRAC versions for Dell hardware
33
containers.podman.podman_container:
4-
name: "{{ bmc_address }}-rac-version"
4+
name: "{{ bmc_name }}-rac-version"
55
network: host
66
image: quay.io/dphillip/racadm-image
77
state: started
@@ -17,6 +17,7 @@
1717
"{{ boot_iso_url }}",
1818
]
1919
register: drac_version
20+
no_log: true
2021

2122
- name: Using iDRAC ISO method for 13G and below
2223
ansible.builtin.include_tasks: ./iso_idrac.yml

roles/vendors/dell/tasks/iso_idrac.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
block:
44
- name: Racadm container to mount and boot to discovery ISO
55
containers.podman.podman_container:
6-
name: "{{ bmc_address }}-rac-image"
6+
name: "{{ bmc_name }}-rac-image"
77
network: host
88
image: quay.io/dphillip/racadm-image
99
state: started

0 commit comments

Comments
 (0)