From bbff7f94bb34bbdc4eddbbecc59297413d802ed8 Mon Sep 17 00:00:00 2001
From: Steve Smith <ssmith@atlassian.com>
Date: Fri, 4 Oct 2019 13:49:43 +1000
Subject: [PATCH] DCD-686: Revert lockfiles as we should move to fine control
 over Ansible versions (again).

---
 roles/aws_common/tasks/amazon.yml     | 1 -
 roles/linux_common/tasks/amazon.yml   | 1 -
 roles/nfs_server/tasks/amazon.yml     | 1 -
 roles/product_common/tasks/amazon.yml | 2 --
 4 files changed, 5 deletions(-)

diff --git a/roles/aws_common/tasks/amazon.yml b/roles/aws_common/tasks/amazon.yml
index f19485a..a6592bf 100644
--- a/roles/aws_common/tasks/amazon.yml
+++ b/roles/aws_common/tasks/amazon.yml
@@ -6,7 +6,6 @@
       - ec2-utils
       - amazon-ssm-agent
       - amazon-efs-utils
-    lock_timeout: 30
 
 - name: Install CloudWatch Agent
   yum:
diff --git a/roles/linux_common/tasks/amazon.yml b/roles/linux_common/tasks/amazon.yml
index ad70b98..3be04db 100644
--- a/roles/linux_common/tasks/amazon.yml
+++ b/roles/linux_common/tasks/amazon.yml
@@ -6,4 +6,3 @@
       - shadow-utils
       - libxml2
       - git-{{ git_version }}
-    lock_timeout: 30
diff --git a/roles/nfs_server/tasks/amazon.yml b/roles/nfs_server/tasks/amazon.yml
index 67b71d0..ad2adee 100644
--- a/roles/nfs_server/tasks/amazon.yml
+++ b/roles/nfs_server/tasks/amazon.yml
@@ -4,4 +4,3 @@
   yum:
     name:
       - nfs-utils
-    lock_timeout: 30
diff --git a/roles/product_common/tasks/amazon.yml b/roles/product_common/tasks/amazon.yml
index 0175922..c02f864 100644
--- a/roles/product_common/tasks/amazon.yml
+++ b/roles/product_common/tasks/amazon.yml
@@ -4,11 +4,9 @@
   yum:
     name:
       - java-{{ java_version }}-openjdk-devel
-    lock_timeout: 30
   when: atl_use_system_jdk
 
 - name: Install other base packages on Amazon Linux
   yum:
     name:
       - dejavu-fonts-common  # Required by the installer
-    lock_timeout: 30