install-aws-cli: Move into puppet files.

tools/setup/bootstrap-aws-installer

@@ -38,7 +38,7 @@ export DEBIAN_FRONTEND=noninteractive
     apt-get -qy autoclean
 )
 
-# The following line gets subbed in with the contents of bootstrap-awscli.sh
+# The following line gets subbed in with the contents of install-aws-cli
 AWS=
 
 # Set up a bare-bones AWS configuration

tools/setup/install-aws-server

@@ -78,7 +78,7 @@ set -x
 
 cd "$(dirname "$0")"
 
-source ./bootstrap-awscli.sh
+source ./../../puppet/zulip_ops/files/install-aws-cli
 
 zulip_install_config_file="$HOME/.zulip-install-server.conf"
 if [ ! -f "$zulip_install_config_file" ]; then
@@ -157,7 +157,7 @@ BOOTDATA=$(mktemp)
     echo "REPO_URL=$REPO_URL"
     echo "BRANCH=$BRANCH"
     echo "SSH_SECRET_ID=$SSH_SECRET_ID"
-    sed '/^AWS=/ r ./bootstrap-awscli.sh' bootstrap-aws-installer
+    sed '/^AWS=/ r ./../../puppet/zulip_ops/files/install-aws-cli' bootstrap-aws-installer
 } >>"$BOOTDATA"
 
 TAG_ROLE_NAMES="$ROLES"