diff options
| author | Zuul <zuul@review.opendev.org> | 2019-09-17 21:19:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-09-17 21:19:26 +0000 |
| commit | 8af2e2c86beff0575b92c9b4e98458770d0f3c51 (patch) | |
| tree | fa53afd01180ca62970a11d56d0605c65f180b64 /devstack | |
| parent | aba282a7fc23124c2fe6a733925cafe5de59fee4 (diff) | |
| parent | 7c5839064f170937f5fe5cf6de71d7c0ee93eefe (diff) | |
| download | ironic-8af2e2c86beff0575b92c9b4e98458770d0f3c51.tar.gz | |
Merge "Remove cisco references and add release note"
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/lib/ironic | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index c2e748aad..4e942adba 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -114,12 +114,6 @@ IRONIC_HW_ARCH=${IRONIC_HW_ARCH:-x86_64} # ipmi: # <BMC address> <MAC address> <BMC username> <BMC password> # -# cisco-ucs-standalone: -# <BMC address> <MAC address> <BMC username> <BMC password> -# -# cisco-ucs-managed: -# <BMC address> <MAC address> <BMC username> <BMC password> <UCS service profile> -# # idrac: # <BMC address> <MAC address> <BMC username> <BMC password> # @@ -298,8 +292,7 @@ fi # are ``ipmi``, ``snmp`` and ``redfish``. # # Additional valid choices if IRONIC_IS_HARDWARE == true are: -# ``cisco-ucs-managed``, ``cisco-ucs-standalone``, ``idrac``, -# and ``irmc``. +# ``idrac`` and ``irmc``. IRONIC_DEPLOY_DRIVER=${IRONIC_DEPLOY_DRIVER:-ipmi} # If the requested driver is not yet enable, enable it, if it is not it will fail anyway @@ -663,16 +656,6 @@ function is_deployed_by_ipmi { return 1 } -function is_deployed_by_cimc { - [[ "${IRONIC_DEPLOY_DRIVER}" == cisco-ucs-standalone ]] && return 0 - return 1 -} - -function is_deployed_by_ucs { - [[ "${IRONIC_DEPLOY_DRIVER}" == cisco-ucs-managed ]] && return 0 - return 1 -} - function is_deployed_by_ilo { [[ "${IRONIC_DEPLOY_DRIVER}" == ilo ]] && return 0 return 1 @@ -2132,17 +2115,6 @@ function enroll_nodes { node_options+=" --driver-info ipmi_address=$bmc_address \ --driver-info ipmi_password=$bmc_passwd \ --driver-info ipmi_username=$bmc_username" - elif is_deployed_by_cimc; then - node_options+=" --driver-info cimc_address=$bmc_address \ - --driver-info cimc_password=$bmc_passwd \ - --driver-info cimc_username=$bmc_username" - elif is_deployed_by_ucs; then - local ucs_service_profile - ucs_service_profile=$(echo $hardware_info |awk '{print $5}') - node_options+=" --driver-info ucs_address=$bmc_address \ - --driver-info ucs_password=$bmc_passwd \ - --driver-info ucs_username=$bmc_username \ - --driver-info ucs_service_profile=$ucs_service_profile" elif is_deployed_by_ilo; then node_options+=" --driver-info ilo_address=$bmc_address \ --driver-info ilo_password=$bmc_passwd \ |