Remove leftover bindep install from pre generic

Also check to see that we do indeed have packages in the PACKAGES list
to install. This may not be the case if all the pacakages already exist,
like in the case of keystone on centos

Change-Id: I19742c0da2f1916ec5b547910f4e5999bff31b90
This commit is contained in:
Sam Yaple 2017-10-07 02:37:41 -04:00
parent 518dbe7173
commit bf931d0b50
2 changed files with 12 additions and 8 deletions

View File

@ -26,12 +26,12 @@ qemu-utils [platform:dpkg qemu]
qemu-img [platform:rpm qemu]
# Nova
libpython2.7 [nova]
libvirt0 [nova]
iproute2 [platform:dpkg nova]
libpython2.7 [platform:dpkg nova]
libvirt0 [platform:dpkg nova]
openvswitch-switch [platform:dpkg nova]
libvirt-libs [platform:rpm nova]
openvswitch [platform:rpm nova]
# Neutron
@ -41,12 +41,12 @@ dnsmasq-utils [neutron]
ebtables [neutron]
ipset [neutron]
iptables [neutron]
iputils-arping [neutron]
keepalived [neutron]
libpython2.7 [neutron]
conntrack [platform:dpkg neutron]
iproute2 [platform:dpkg neutron]
iputils-arping [platform:dpkg neutron]
libpython2.7 [platform:dpkg neutron]
openvswitch-switch [platform:dpkg neutron]
uuid-runtime [platform:dpkg neutron]

View File

@ -23,6 +23,7 @@ case ${distro} in
yum install -y --setopt=skip_missing_names_on_install=False \
git \
python-virtualenv \
redhat-lsb-core \
sudo
;;
*)
@ -59,7 +60,6 @@ $(dirname $0)/pip_install.sh \
bindep \
${packages[@]}
$(dirname $0)/pip_install.sh bindep
PACKAGES=($(bindep -f /opt/loci/bindep.txt -b ${PROJECT} ${PROFILES} || :))
groupadd -g 42424 ${PROJECT}
@ -70,14 +70,18 @@ chown ${PROJECT}:${PROJECT} /etc/${PROJECT} /var/log/${PROJECT} /var/lib/${PROJE
case ${distro} in
debian|ubuntu)
apt-get install -y --no-install-recommends ${PACKAGES[@]}
if [[ ! -z ${PACKAGES} ]]; then
apt-get install -y --no-install-recommends ${PACKAGES[@]}
fi
apt-get purge -y --auto-remove \
git \
virtualenv
rm -rf /var/lib/apt/lists/*
;;
centos)
yum -y --setopt=skip_missing_names_on_install=False install ${PACKAGES[@]}
if [[ ! -z ${PACKAGES} ]]; then
yum -y --setopt=skip_missing_names_on_install=False install ${PACKAGES[@]}
fi
yum -y autoremove \
git \
python-virtualenv