summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorAdam Miller <admiller@redhat.com>2015-11-18 16:19:19 -0600
committerAdam Miller <admiller@redhat.com>2015-12-02 14:55:29 -0600
commitaf009a7a51d7b6f5799a14c452cc7db92727135e (patch)
treeafe2cebb1e98aa52fdf9bc21f03ebdaf4aa27bdc /utils
parentebf659b0c1775f9be3e52a8ef420d568656c10f9 (diff)
downloadopenshift-af009a7a51d7b6f5799a14c452cc7db92727135e.tar.gz
openshift-af009a7a51d7b6f5799a14c452cc7db92727135e.tar.bz2
openshift-af009a7a51d7b6f5799a14c452cc7db92727135e.tar.xz
openshift-af009a7a51d7b6f5799a14c452cc7db92727135e.zip
Fedora changes:
- ansible bootstrap playbook for Fedora 23+ - add conditionals to handle yum vs dnf - add Fedora OpenShift COPR - update BYO host README for repo configs and fedora bootstrap Fix typo in etcd README, remove unnecessary parens in openshift_node main.yml rebase on master, update package cache refresh handler for yum vs dnf Fix typo in etcd README, remove unnecessary parens in openshift_node main.yml
Diffstat (limited to 'utils')
-rwxr-xr-xutils/site_assets/oo-install-bootstrap.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/utils/site_assets/oo-install-bootstrap.sh b/utils/site_assets/oo-install-bootstrap.sh
index e1b2cec90..3847c029a 100755
--- a/utils/site_assets/oo-install-bootstrap.sh
+++ b/utils/site_assets/oo-install-bootstrap.sh
@@ -9,6 +9,13 @@ cmdlnargs="$@"
: ${OO_INSTALL_LOG:=${TMPDIR}/INSTALLPKGNAME.log}
[[ $TMPDIR != */ ]] && TMPDIR="${TMPDIR}/"
+if rpm -q dnf;
+then
+ PKG_MGR="dnf"
+else
+ PKG_MGR="yum"
+fi
+
if [ $OO_INSTALL_CONTEXT != 'origin_vm' ]
then
clear
@@ -18,7 +25,7 @@ if [ -e /etc/redhat-release ]
then
for i in python python-virtualenv openssh-clients gcc
do
- rpm -q $i >/dev/null 2>&1 || { echo >&2 "Missing installation dependency detected. Please run \"yum install ${i}\"."; exit 1; }
+ rpm -q $i >/dev/null 2>&1 || { echo >&2 "Missing installation dependency detected. Please run \"${PKG_MGR} install ${i}\"."; exit 1; }
done
fi
for i in python virtualenv ssh gcc