summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Chapman <woppin@gmail.com>2016-09-08 12:33:54 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-08 12:33:54 +0000
commit9ddcfec06778ea72eb87065b278063d2f1a2eb89 (patch)
tree8e67e91fa6c2a53ed6d3f216b36d9dec8b6f69dd
parent83e3a718e26ca42465a03c7d70eb241e82e45e1e (diff)
parent4c2c4671811c7f95e0178178a941f1dc6298a05c (diff)
Merge "Add python3-ipmi to dependencies in doc and spec" into stable/colorado
-rw-r--r--build/rpm_specs/opnfv-apex-common.spec2
-rw-r--r--docs/installationprocedure/baremetal.rst3
2 files changed, 3 insertions, 2 deletions
diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec
index af4351e8..8cd76d65 100644
--- a/build/rpm_specs/opnfv-apex-common.spec
+++ b/build/rpm_specs/opnfv-apex-common.spec
@@ -11,7 +11,7 @@ Source0: opnfv-apex-common.tar.gz
BuildArch: noarch
BuildRequires: python-docutils python34-devel
Requires: openstack-tripleo opnfv-apex-sdn opnfv-apex-undercloud openvswitch qemu-kvm bridge-utils libguestfs-tools
-Requires: initscripts net-tools iputils iproute iptables python34 python34-yaml python3-jinja2
+Requires: initscripts net-tools iputils iproute iptables python34 python34-yaml python3-jinja2 python3-ipmi
Requires: ipxe-roms-qemu >= 20160127-1
%description
diff --git a/docs/installationprocedure/baremetal.rst b/docs/installationprocedure/baremetal.rst
index 1b22a74c..8507b445 100644
--- a/docs/installationprocedure/baremetal.rst
+++ b/docs/installationprocedure/baremetal.rst
@@ -124,6 +124,7 @@ Install Bare Metal Jumphost
- opnfv-apex-common - (reqed) Supporting config files and scripts
- python34-markupsafe - (reqed) Dependency of opnfv-apex-common **
- python3-jinja2 - (reqed) Dependency of opnfv-apex-common **
+ - python3-ipmi - (reqed) Dependency of opnfv-apex-common **
\* One or more of these RPMs is required
Only one of opnfv-apex, opnfv-apex-onos and opnfv-apex-opendaylight-sfc is
@@ -139,7 +140,7 @@ Install Bare Metal Jumphost
To install these RPMs download them to the local disk on your CentOS 7
install and pass the file names directly to yum:
``sudo yum install python34-markupsafe-<version>.rpm
- python3-jinja2-<version>.rpm``
+ python3-jinja2-<version>.rpm python3-ipmi-<version>.rpm``
``sudo yum install opnfv-apex-<version>.rpm
opnfv-apex-undercloud-<version>.rpm opnfv-apex-common-<version>.rpm``