Compare commits

..

No commits in common. "dc19682f65a026ca0bf8b431b8b32a73c065b7af" and "e09dd647f39702c937a29cd4d37e190f0c6f115e" have entirely different histories.

1 changed files with 2 additions and 5 deletions

View File

@ -19,22 +19,19 @@ function install_hashicorp_tools()
{ {
packer_version="1.6.1" packer_version="1.6.1"
terraform_version="0.14.3" terraform_version="0.14.3"
ansible_version="2.10.2"
if [[ ${DISTRIB_ID} == "ManjaroLinux" ]] if [[ ${DISTRIB_ID} == "ManjaroLinux" ]]
then then
pacman -Syq make ansible terraform packer --noconfirm pacman -Syq make terraform packer --noconfirm
return ${?} return ${?}
elif [[ ${DISTRIB_ID} == "Ubuntu" ]] elif [[ ${DISTRIB_ID} == "Ubuntu" ]]
then then
apt-get update
apt-get -y install software-properties-common make apt-get -y install software-properties-common make
gpg_key_url="https://apt.releases.hashicorp.com/gpg" gpg_key_url="https://apt.releases.hashicorp.com/gpg"
curl -fsSL ${gpg_key_url} | apt-key add - curl -fsSL ${gpg_key_url} | apt-key add -
apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main" apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"
apt-add-repository --yes --update ppa:ansible/ansible
apt-get update apt-get update
apt-get -y install --allow-downgrades ansible=${ansible_version} terraform=${terraform_version} packer=${packer_version} apt-get -y install --allow-downgrades terraform=${terraform_version} packer=${packer_version}
return ${?} return ${?}
fi fi
} }