diff options
| author | Zuul <zuul@review.opendev.org> | 2020-10-01 13:03:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-10-01 13:03:59 +0000 |
| commit | 33a34ce364ce28077a114b7d1a80fd719521580a (patch) | |
| tree | 3acdf9541843495ac1864e560138213fbb4c2f33 | |
| parent | 101fc29686a4bf327521f7a4025a6c301db89e84 (diff) | |
| parent | f28d30eafe8b52400e3801832eef9993a9a95be8 (diff) | |
| download | ironic-33a34ce364ce28077a114b7d1a80fd719521580a.tar.gz | |
Merge "Feat: add ibmc hardware info support for devstack"16.0.0
| -rw-r--r-- | devstack/lib/ironic | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index af7675762..899a42a55 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -794,11 +794,21 @@ function is_deployed_by_xclarity { return 1 } +function is_deployed_by_ibmc { + [[ "$IRONIC_DEPLOY_DRIVER" == ibmc ]] && return 0 + return 1 +} + function is_drac_enabled { [[ -z "${IRONIC_ENABLED_HARDWARE_TYPES%%*idrac*}" ]] && return 0 return 1 } +function is_ibmc_enabled { + [[ -z "${IRONIC_ENABLED_HARDWARE_TYPES%%*ibmc*}" ]] && return 0 + return 1 +} + function is_ansible_deploy_enabled { [[ -z "${IRONIC_ENABLED_DEPLOY_INTERFACES%%*ansible*}" ]] && return 0 return 1 @@ -1137,6 +1147,10 @@ function install_ironic { pip_install python-dracclient fi + if is_ibmc_enabled; then + pip_install python-ibmcclient + fi + if is_ansible_deploy_enabled; then pip_install "$(grep '^ansible' $IRONIC_DIR/driver-requirements.txt | awk '{print $1}')" fi @@ -2414,6 +2428,11 @@ function enroll_nodes { --driver-info xclarity_password=$bmc_passwd \ --driver-info xclarity_username=$bmc_username \ --driver-info xclarity_hardware_id=$xclarity_hardware_id" + elif is_deployed_by_ibmc; then + node_options+=" --driver-info ibmc_address=$bmc_address \ + --driver-info ibmc_username=$bmc_username \ + --driver-info ibmc_password=$bmc_passwd \ + --driver-info ibmc_verify_ca=False" fi interface_info="${mac_address}" |