Commit 7571c26d authored by Thomas Goirand's avatar Thomas Goirand

Only install libxml-xpath-perl if needed.

parent bd51ba67
......@@ -172,6 +172,12 @@ if [ -d /oci-in-target ] ; then
fi
fi
# This has to be installed *after* the debootstrap, otherwise debootstrap will fail
# and libxml-xpath-perl is a dependency of oci-fixup-compute-node
if [ -x ${BODI_CHROOT_PATH}/usr/bin/oci-fixup-compute-node ] ; then
chroot ${BODI_CHROOT_PATH} apt-get install libxml-xpath-perl
fi
# Setup the /etc/rc.local to start the puppet-agent on boot
echo "#!/bin/sh
......
......@@ -654,7 +654,7 @@ function slave_install_server_os_command($con, $conf, $machine_id){
$cmd .= " --sources.list-mirror ".$conf["network"]["debian_mirror"];
$cmd .= " --security-mirror ".$conf["network"]["debian_security_mirror"];
$cmd .= " --dest-hdd $install_hdd_name";
$cmd .= " --no-cloud-init --extra-packages libxml-xpath-perl,uuid-runtime,curl,less,joe,ssl-cert,most,screen,vim,vim-tiny,tcpd,xfsdump,unzip,tcpdump,ntpstat,ca-certificates,rpcbind,lftp,at,tree,lsof,bind9-host,dnsutils,strace,tmux,nano,bash-completion,openssl,ntp,file,net-tools,iproute2,ipmitool,ca-certificates,xfsprogs,parted,nmap,mtr-tiny,ladvd$package_list_file";
$cmd .= " --no-cloud-init --extra-packages uuid-runtime,curl,less,joe,ssl-cert,most,screen,vim,vim-tiny,tcpd,xfsdump,unzip,tcpdump,ntpstat,ca-certificates,rpcbind,lftp,at,tree,lsof,bind9-host,dnsutils,strace,tmux,nano,bash-completion,openssl,ntp,file,net-tools,iproute2,ipmitool,ca-certificates,xfsprogs,parted,nmap,mtr-tiny,ladvd$package_list_file";
$cmd .= " --hook-script /usr/bin/openstack-cluster-installer-bodi-hook-script";
$cmd .= " --root-ssh-key /root/.ssh/authorized_keys";
$cmd .= " --install-nonfree-repo --postinstall-packages firmware-bnx2,firmware-bnx2x,puppet";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment