sig_cloud/diskimage-builder
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update hpssacli to ssacli in proliant-tools element

Browse Source 
This commit updates the CLI utility name hpssacli to
ssacli  as part of company name change from HP to HPE.
ssacli will work seamlessly for all the cases where
hpssacli is used.

It also updates the custom URL location for ssacli
utility with new location.

Change-Id: I2de4d3430e7308d25e36dc6960783699aa17dfae
This commit is contained in:
Aparna 2016-11-10 11:21:44 +00:00
parent 587d14feed
commit cb3e1076e3
2 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
elements/proliant-tools/README.rst
View File

@ -3,7 +3,7 @@ proliant-tools
* This element can be used when building ironic-agent ramdisk. It * This element can be used when building ironic-agent ramdisk. It
enables ironic-agent ramdisk to do in-band cleaning operations specific enables ironic-agent ramdisk to do in-band cleaning operations specific
to HP ProLiant hardware. to HPE ProLiant hardware.
* Works with ubuntu and fedora distributions (on which ironic-agent * Works with ubuntu and fedora distributions (on which ironic-agent
element is supported). element is supported).
@ -11,20 +11,24 @@ proliant-tools
* Currently the following utilities are installed: * Currently the following utilities are installed:
+ `proliantutils`_ - This module registers an ironic-python-agent hardware + `proliantutils`_ - This module registers an ironic-python-agent hardware
manager for HP ProLiant hardware, which implements in-band cleaning manager for HPE ProLiant hardware, which implements in-band cleaning
steps. The latest version of ``proliantutils`` available is steps. The latest version of ``proliantutils`` available is
installed. This python module is released with Apache license. installed. This python module is released with Apache license.
+ `HP Smart Storage Administrator (HP SSA) CLI for Linux 64-bit`_ - This + `HPE Smart Storage Administrator (HPE SSA) CLI for Linux 64-bit`_ - This
utility is used by ``proliantutils`` library above for doing in-band RAID utility is used by ``proliantutils`` library above for doing in-band RAID
configuration on HP ProLiant hardware. Currently installed version is configuration on HPE ProLiant hardware. Currently installed version is
2.30. Newer version of ``hpssacli`` when available, may be installed to 2.60. Newer version of ``ssacli`` when available, may be installed to
the ramdisk by using the environment variable ``DIB_HPSSACLI_URL``. the ramdisk by using the environment variable ``DIB_SSACLI_URL``.
``DIB_HPSSACLI_URL`` should contain the HTTP(S) URL for downloading the ``DIB_SSACLI_URL`` should contain the HTTP(S) URL for downloading the
RPM package for ``hpssacli`` utility. Availability of newer versions can RPM package for ``ssacli`` utility. The old environmental variable
be in the Revision History in the above link. This utility is closed source ``DIB_HPSSACLI_URL``,a HTTP(S) URL for downloading the RPM package for
and is released with `HP End User License Agreement – Enterprise Version`_. ``hpssacli`` utility, is deprecated. The ``hpssacli`` utility is not
supported anymore, use ``ssacli`` instead for the same functionality.
Availability of newer versions can be in the Revision History
in the above link. This utility is closed source and is released with
`HPE End User License Agreement – Enterprise Version`_.
.. _`proliantutils`: https://pypi.python.org/pypi/proliantutils .. _`proliantutils`: https://pypi.python.org/pypi/proliantutils
.. _`HP Smart Storage Administrator (HP SSA) CLI for Linux 64-bit`: http://h20564.www2.hpe.com/hpsc/swd/public/detail?swItemId=MTX_b6a6acb9762443b182280db805 .. _`HPE Smart Storage Administrator (HPE SSA) CLI for Linux 64-bit`: http://h20564.www2.hpe.com/hpsc/swd/public/detail?swItemId=MTX_3d16386b418a443388c18da82f&swEnvOid=4181
.. _`HP End User License Agreement – Enterprise Version`: ftp://ftp.hp.com/pub/softlib2/software1/doc/p2057331991/v33194/hpeula-en.html .. _`HPE End User License Agreement – Enterprise Version`: https://downloads.hpe.com/pub/softlib2/software1/doc/p1796552785/v113125/eula-en.html

24
elements/proliant-tools/install.d/65-proliant-tools-install
View File

@ -21,18 +21,22 @@ fi
set -eu set -eu
set -o pipefail set -o pipefail
# Set the below variable to allow hpssacli to be installed from custom URLs. # Set the below variable to allow ssacli to be installed from custom URLs.
DIB_HPSSACLI_URL=${DIB_HPSSACLI_URL:-https://ftp.hp.com/pub/softlib2/software1/pubsw-linux/p1857046646/v109216/hpssacli-2.30-6.0.x86_64.rpm} if [[ -n "${DIB_HPSSACLI_URL:=}" ]]; then
curl -k -o /tmp/hpssacli.rpm $DIB_HPSSACLI_URL echo "The environment variable DIB_HPSSACLI_URL is deprecated; use DIB_SSACLI_URL instead."
if [[ $DISTRO_NAME = "ubuntu" || $DISTRO_NAME = "debian" ]]; then
# There is no deb package for hpssacli. Install with alien.
alien -i /tmp/hpssacli.rpm
else
rpm -iv /tmp/hpssacli.rpm
fi fi
rm -f /tmp/hpssacli.rpm DIB_SSACLI_URL=${DIB_SSACLI_URL:-${DIB_HPSSACLI_URL:-https://downloads.hpe.com/pub/softlib2/software1/pubsw-linux/p1857046646/v123474/ssacli-2.60-19.0.x86_64.rpm}}
curl -k -o /tmp/ssacli.rpm $DIB_SSACLI_URL
if [[ $DISTRO_NAME = "ubuntu" || $DISTRO_NAME = "debian" ]]; then
# There is no deb package for ssacli. Install with alien.
alien -i /tmp/ssacli.rpm
else
rpm -iv /tmp/ssacli.rpm
fi
rm -f /tmp/ssacli.rpm
# Install proliantutils python module in the # Install proliantutils python module in the
# virtual environment of ironic-python-agent. # virtual environment of ironic-python-agent.