Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add redfish bmc protocol to BMH CR #1697

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions roles/deploy_bmh/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ The resulting CR will contain, for each node, the following objects:
* `cifmw_deploy_bmh_patch_nmstate`: (*dict*) Dictionary to combine with each of generated BMH nmstate Secret CRs. Defaults to `{}`
* `cifmw_deploy_bmh_node_patch_nmstate`: (*dict*) Dictionary with an individual BMH nmstate Secret CR patch per node. Defaults to `{}`
* `cifmw_deploy_bmh_root_device_hint_field`: (*string*) The default field to use in the BMH `rootDeviceHints` when a node has `root_device_hint` populated. Defaults to `deviceName`
* `cifmw_deploy_bmh_redfish_bmc_protocol`: (*string*) The RedFish BMC protocol you would like to use, options are `redfish` or `redfish-virtualmedia`. Defaults to `redfish-virtualmedia`

## Examples

Expand Down
2 changes: 2 additions & 0 deletions roles/deploy_bmh/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,5 @@ cifmw_deploy_bmh_disable_certificate_validation: true
cifmw_deploy_bmh_disable_inspection: true

cifmw_deploy_bmh_root_device_hint_field: deviceName

cifmw_deploy_bmh_redfish_bmc_protocol: redfish-virtualmedia
2 changes: 1 addition & 1 deletion roles/deploy_bmh/template/bmh.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ metadata:
workload: {{ node_name.split('-')[0] }}
spec:
bmc:
address: {{ node_data['connection'] }}
address: {{ cifmw_deploy_bmh_redfish_bmc_protocol ~ '+' if 'redfish' in node_data['connection'] }}{{ node_data['connection'] }}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are using idrac in most of the DS hardware, this approach will blow the entire NFV job.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I checked the D/S job and only seen ipmi addresses in the rendered bmh resource? If you could point me to a reference on Slack I would be grateful.

You're right though, this test is too broad and would affect anyone using redfish, I'll have a think and submit a revision, thanks :)

credentialsName: {{ node_name }}-bmc-secret
disableCertificateVerification: {{ cifmw_deploy_bmh_disable_certificate_validation }}
{% for nic in (node_data['nics'] | default([])) if nic['network'] == cifmw_deploy_bmh_boot_interface %}
Expand Down