Added missing package wget

haxorof · Dec 20, 2016 · f128ff8 · f128ff8
1 parent 741464f
commit f128ff8
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/tasks/env.yml b/tasks/env.yml
@@ -1,3 +1,12 @@
+- name: Ensure required packages is present
+  package: >
+    name={{item}}
+    state=present
+  become: true
+  with_items:
+    - unzip
+    - wget
+
 - name: Architecture - linux_amd64
   set_fact:
     hashicorp_architecture:  linux_amd64
@@ -10,12 +19,6 @@
   when: ansible_system == "Linux" and
     ansible_architecture == "i386"
 
-- name: Ensure unzip is present
-  package: >
-    name=unzip
-    state=present
-  become: true
-
 - name: Ensure HashiCorp temporary directory exists
   file: >
     path={{ hashicorp.download_dir }}

diff --git a/test/docker-run.sh b/test/docker-run.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+docker run --name ansible_test --rm -it -v '/vagrant:/vagrant' -v '/mnt/ansible:/mnt/ansible' ansible/centos7-ansible:stable /vagrant/test-docker.sh
diff --git a/test/test-docker.sh b/test/test-docker.sh
@@ -3,5 +3,7 @@ TEST_HOME=$HOME/ansible-test
 mkdir -p $TEST_HOME/roles
 cp /vagrant/* $TEST_HOME/
 cd $TEST_HOME
-ln -s /mnt/ansible $TEST_HOME/roles/role-under-test
+if [[ ! -d $TEST_HOME/roles/role-under-test ]]; then
+    ln -s /mnt/ansible $TEST_HOME/roles/role-under-test
+fi
 $TEST_HOME/test.sh
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		#!/bin/bash
		docker run --name ansible_test --rm -it -v '/vagrant:/vagrant' -v '/mnt/ansible:/mnt/ansible' ansible/centos7-ansible:stable /vagrant/test-docker.sh