Merge pull request #123 from lawliet89/rm-boto

Remove boto and pip installation from default installation

Author: Etiene

examples/vault-consul-ami/vault-consul.json

@@ -7,6 +7,7 @@
     "consul_version": "1.3.1",
     "consul_download_url": "{{env `CONSUL_DOWNLOAD_URL`}}",
     "vault_download_url": "{{env `VAULT_DOWNLOAD_URL`}}",
+    "install_auth_signing_script": "true",
     "ca_public_key_path": null,
     "tls_public_key_path": null,
     "tls_private_key_path": null
@@ -86,7 +87,11 @@
 },{
     "type": "shell",
     "inline": [
+      "if [ '{{user `install_auth_signing_script`}}' = 'true' ]; then",
       "sudo mv /tmp/sign-request.py /opt/vault/scripts/",
+      "else",
+      "sudo rm /tmp/sign-request.py",
+      "fi",
       "sudo mv /tmp/ca.crt.pem /opt/vault/tls/",
       "sudo mv /tmp/vault.crt.pem /opt/vault/tls/",
       "sudo mv /tmp/vault.key.pem /opt/vault/tls/",
@@ -98,7 +103,11 @@
   },{
     "type": "shell",
     "inline": [
-      "sudo apt-get install -y git"
+      "sudo apt-get install -y git",
+      "if [ '{{user `install_auth_signing_script`}}' = 'true' ]; then",
+      "sudo apt-get install -y python-pip",
+      "LC_ALL=C && sudo pip install boto3",
+      "fi"
     ],
     "only": ["ubuntu16-ami"]
   },{

examples/vault-iam-auth/README.md

@@ -36,7 +36,8 @@ of the Vault nodes.
 
 1. `git clone` this repo to your computer.
 1. Build a Vault and Consul AMI. See the [vault-consul-ami example][vault_consul_ami] documentation for
-   instructions. Make sure to note down the ID of the AMI.
+   instructions. Make sure the `install_auth_signing_script` variable is `true`.
+   Make sure to note down the ID of the AMI.
 1. Install [Terraform](https://www.terraform.io/).
 1. Open `vars.tf`, set the environment variables specified at the top of the file, and fill in any other variables that
    don't have a default. Put the AMI ID you previously took note into the `ami_id` variable.

modules/install-vault/install-vault

@@ -174,9 +174,8 @@ function install_dependencies {
 
   if $(has_apt_get); then
     sudo apt-get update -y
-    sudo apt-get install -y awscli curl unzip jq python-pip
+    sudo apt-get install -y awscli curl unzip jq
     install_supervisord_debian
-    LC_ALL=C && sudo pip install boto3
   elif $(has_yum); then
     sudo yum update -y
     sudo yum install -y awscli curl unzip jq