diff --git a/install/ansible.sh b/install/ansible.sh new file mode 100755 index 00000000..f5dd13c6 --- /dev/null +++ b/install/ansible.sh @@ -0,0 +1,25 @@ +#!/bin/bash +# + +echo "Installing Ansible" +DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +source $DIR/install.conf +if [ -f $DIR/env.conf ]; then + source env.conf +else + echo "failed to load environment" + exit 1 +fi +source $DIR/install_func.sh + +echo "INstalling ansible related packages" +sudo yum -y install ansible +if [[ "$?" != "0" ]]; then + echo "Failed to install ansible" + exit 1 +fi + +sudo mkdir -p /var/ansible/run +sudo mkdir -p /root/backup/ansible +sudo cp -rn /var/ansible/* /root/backup/ansible/ +sudo cp -rf $ADAPTERS_HOME/ansible/* /var/ansible/ diff --git a/install/install.conf b/install/install.conf index f6c66033..d2dd7b92 100755 --- a/install/install.conf +++ b/install/install.conf @@ -6,7 +6,7 @@ export OS_INSTALLER=${OS_INSTALLER:-cobbler} # PACKAGE_INSTALLER indicates the tool for Package provisioning, default is 'chef'. -export PACKAGE_INSTALLER=${PACKAGE_INSTALLER:-chef} +export PACKAGE_INSTALLER=${PACKAGE_INSTALLER:-package} # service NIC export NIC=${NIC:-} diff --git a/install/install.sh b/install/install.sh index 49799bd0..a9c8b470 100755 --- a/install/install.sh +++ b/install/install.sh @@ -340,7 +340,8 @@ echo "Install the OS Installer Tool" source ${COMPASSDIR}/install/$OS_INSTALLER.sh || exit $? echo "Install the Package Installer Tool" -source ${COMPASSDIR}/install/$PACKAGE_INSTALLER.sh || exit $? +source ${COMPASSDIR}/install/chef.sh || exit $? +source ${COMPASSDIR}/install/ansible.sh || exit $? echo "Download and install Compass Web" source ${COMPASSDIR}/install/compass_web.sh || exit $?