Merge branch 'feature/update-packer' into 'master'

disable packer builds for now, testing docker provider with ansible

See merge request all-staff/hashiqube!168

Author: Riaan Nolan

ansible/requirements.txt

@@ -50,18 +50,18 @@ requests==2.25.1
 requests-ntlm==1.1.0
 resolvelib==0.5.4
 rich==10.4.0
-ruamel.yaml==0.17.10
-ruamel.yaml.clib==0.2.4
+ruamel.yaml
+ruamel.yaml.clib
 selinux==0.2.1
-setuptools==51.1.1
+setuptools
 six==1.16.0
 subprocess-tee==0.3.2
 tenacity==7.0.0
 text-unidecode==1.3
 urllib3==1.26.6
 wcmatch==8.2
 websocket-client==1.1.0
-wheel==0.36.2
+wheel
 xmltodict==0.12.0
 yamllint
 ansible-tower-cli

hashicorp/packer.sh

@@ -95,7 +95,7 @@ EOF
   vault kv put kv/ansible devops="all the things"
   ANSIBLE_TOKEN=$(vault write auth/approle/login role_id="${ANSIBLE_ROLE_ID}" secret_id="${ANSIBLE_ROLE_SECRET_ID}" | grep token | head -n1 | tr -s ' ' | cut -d ' ' -f2)
   echo -e '\e[38;5;198m'"++++ ANSIBLE_TOKEN: ${ANSIBLE_TOKEN}"
-  sed -i "s:token=[^ ]*:token=${ANSIBLE_TOKEN}:" /vagrant/hashicorp/packer/linux/ubuntu/playbook.yml
+  # sed -i "s:token=[^ ]*:token=${ANSIBLE_TOKEN}:" /vagrant/hashicorp/packer/linux/ubuntu/playbook.yml
   echo -e '\e[38;5;198m'"++++ Install Ansible to configure Containers/VMs/AMIs/Whatever"
   sudo DEBIAN_FRONTEND=noninteractive apt-get update
   sudo DEBIAN_FRONTEND=noninteractive apt-get install -y python3-pip
@@ -115,7 +115,9 @@ EOF
     sudo bash /vagrant/docker/docker.sh
   fi
   echo -e '\e[38;5;198m'"++++ Packer build Linux Docker container configured with Ansible"
-  packer build /vagrant/hashicorp/packer/linux/ubuntu/ubuntu20.04.json
+  # packer build /vagrant/hashicorp/packer/linux/ubuntu/ubuntu-2204.hcl
+  cd /vagrant/hashicorp/packer/
+  ./run.sh
 }
 
 packer-install

hashicorp/packer/linux/ubuntu/ubuntu-1804.pkr.hcl

@@ -78,11 +78,17 @@ source "vagrant" "ubuntu-1804" {
   output_dir      = "${var.build_directory}/ubuntu-1804/vagrant"
 }
 
+source "docker" "ubuntu-1804" {
+  image   = "ubuntu:18.04"
+  commit  = false
+  discard = true
+}
+
 # a build block invokes sources and runs provisioning steps on them. The
 # documentation for build blocks can be found here:
 # https://www.packer.io/docs/templates/hcl_templates/blocks/build
 build {
-  sources = ["source.vagrant.ubuntu-1804", "source.azure-arm.ubuntu-1804", "source.amazon-ebs.ubuntu-1804", "source.googlecompute.ubuntu-1804"]
+  sources = ["source.docker.ubuntu-1804", "source.vagrant.ubuntu-1804", "source.azure-arm.ubuntu-1804", "source.amazon-ebs.ubuntu-1804", "source.googlecompute.ubuntu-1804"]
 
   provisioner "shell" {
     inline = [
@@ -94,7 +100,7 @@ build {
     command = "./scripts/ansible.sh"
     extra_arguments = [
       #"-v",
-      "--extra-vars", "ansible_become=true version_number=${local.version_number}"
+      "--extra-vars", "ansible_python_interpreter=/usr/bin/python3 ansible_become=true version_number=${local.version_number}"
     ]
     ansible_ssh_extra_args = [
       "-o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa"

hashicorp/packer/linux/ubuntu/ubuntu-2004.pkr.hcl

@@ -78,11 +78,17 @@ source "vagrant" "ubuntu-2004" {
   output_dir      = "${var.build_directory}/ubuntu-2004/vagrant"
 }
 
+source "docker" "ubuntu-2004" {
+  image   = "ubuntu:20.04"
+  commit  = false
+  discard = true
+}
+
 # a build block invokes sources and runs provisioning steps on them. The
 # documentation for build blocks can be found here:
 # https://www.packer.io/docs/templates/hcl_templates/blocks/build
 build {
-  sources = ["source.vagrant.ubuntu-2004", "source.azure-arm.ubuntu-2004", "source.amazon-ebs.ubuntu-2004", "source.googlecompute.ubuntu-2004"]
+  sources = ["source.docker.ubuntu-2004", "source.vagrant.ubuntu-2004", "source.azure-arm.ubuntu-2004", "source.amazon-ebs.ubuntu-2004", "source.googlecompute.ubuntu-2004"]
 
   provisioner "shell" {
     inline = ["cat /etc/os-release"]

hashicorp/packer/linux/ubuntu/ubuntu-2204.pkr.hcl

@@ -78,11 +78,17 @@ source "vagrant" "ubuntu-2204" {
   output_dir      = "${var.build_directory}/ubuntu-2204/vagrant"
 }
 
+source "docker" "ubuntu-2204" {
+  image   = "ubuntu:22.04"
+  commit  = false
+  discard = true
+}
+
 # a build block invokes sources and runs provisioning steps on them. The
 # documentation for build blocks can be found here:
 # https://www.packer.io/docs/templates/hcl_templates/blocks/build
 build {
-  sources = ["source.vagrant.ubuntu-2204", "source.azure-arm.ubuntu-2204", "source.amazon-ebs.ubuntu-2204", "source.googlecompute.ubuntu-2204"]
+  sources = ["source.docker.ubuntu-2204", "source.vagrant.ubuntu-2204", "source.azure-arm.ubuntu-2204", "source.amazon-ebs.ubuntu-2204", "source.googlecompute.ubuntu-2204"]
 
   provisioner "shell" {
     inline = ["cat /etc/os-release"]
@@ -92,9 +98,9 @@ build {
     command = "./scripts/ansible.sh"
     user    = "${build.User}"
     extra_arguments = [
-      #"-v",
+      "-vvv",
       "--tags", "always,day0",
-      "--extra-vars", "ansible_become=true version_number=${local.version_number}"
+      "--extra-vars", "ansible_python_interpreter=/vagrant/ansible/ansible-venv/bin/python ansible_become=true version_number=${local.version_number}"
     ]
     ansible_ssh_extra_args = [
       "-o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa"
@@ -108,7 +114,7 @@ build {
     user    = "${build.User}"
     extra_arguments = [
       #"-v",
-      "--extra-vars", "foo=bar"
+      "--extra-vars", "ansible_python_interpreter=/vagrant/ansible/ansible-venv/bin/python foo=bar"
     ]
     ansible_ssh_extra_args = [
       "-o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa"
@@ -123,7 +129,7 @@ build {
     user    = "${build.User}"
     extra_arguments = [
       #"-v",
-      "--extra-vars", "foo=bar"
+      "--extra-vars", "ansible_python_interpreter=/vagrant/ansible/ansible-venv/bin/python foo=bar"
     ]
     ansible_ssh_extra_args = [
       "-o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedKeyTypes=+ssh-rsa"

hashicorp/packer/run.sh

@@ -18,4 +18,4 @@ scripts/install-ansible.sh
 echo -e "++++ "
 echo -e "++++ Run Packer"
 echo -e "++++ "
-packer build -force -only='vagrant.ubuntu-2204' all
+# packer build -force -only='docker.ubuntu-2204' all

hashicorp/packer/scripts/install-ansible.sh

@@ -24,7 +24,7 @@ python3 -V
 pip3 -V
 
 echo -e "++++ "
-echo -e "++++ Install Python Pip Packages"
+echo -e "++++ Install Python Pip Packages (Will take ~5 minutes)"
 echo -e "++++ "
 pip3 install -r ../../ansible/requirements.txt --no-cache-dir --quiet
 

hashiqube/basetools.sh

@@ -4,7 +4,7 @@ export DEBIAN_FRONTEND=noninteractive
 export PATH=$PATH:/root/.local/bin
 sudo DEBIAN_FRONTEND=noninteractive apt-get --assume-yes update -o Acquire::CompressionTypes::Order::=gz
 sudo DEBIAN_FRONTEND=noninteractive apt-get --assume-yes upgrade
-sudo DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install swapspace rkhunter jq curl unzip software-properties-common bzip2 git make python3.9 python3-pip python3-dev python3-virtualenv golang-go apt-utils ntp update-motd toilet figlet nano iputils-ping dnsutils iptables telnet
+sudo DEBIAN_FRONTEND=noninteractive apt-get --assume-yes install swapspace rkhunter jq curl unzip software-properties-common bzip2 git make python3.9 python3-pip python3-dev python3-venv python3-virtualenv golang-go apt-utils ntp update-motd toilet figlet nano iputils-ping dnsutils iptables telnet
 sudo update-alternatives --install /usr/bin/python python /usr/bin/python3.9 1 --force
 sudo update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 1 --force
 python -V