Merge pull request #56 from willshersystems/test_link_fix

Remove circular symlink in tests dir
This commit is contained in:
Matt Willsher 2017-05-04 14:19:03 +01:00 committed by GitHub
commit b5a1b14ab1
5 changed files with 19 additions and 14 deletions

1
.gitignore vendored
View file

@ -1 +1,2 @@
.vagrant
tests/roles/ansible-sshd

29
Vagrantfile vendored
View file

@ -4,24 +4,29 @@
VAGRANTFILE_API_VERSION = "2"
Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
# config.vm.define "ubuntu" do |ubuntu|
# ubuntu.vm.box = "ubuntu/trusty64"
# ubuntu.vm.provision "shell", inline: <<-SHELL
# sudo add-apt-repository -y ppa:ansible/ansible
# sudo apt-get update -qq
# sudo apt-get -qq install ansible
# SHELL
# end
config.vm.define "centos6" do |centos|
centos.vm.box = "bento/centos-6.7"
config.vm.define "ubuntu" do |ubuntu|
ubuntu.vm.box = "boxcutter/ubuntu1604"
# ubuntu.vm.provision "shell", inline: <<-SHELL
# sudo add-apt-repository -y ppa:ansible/ansible
# sudo apt-get update -qq
# sudo apt-get -qq install ansible
# SHELL
end
# config.vm.define "centos7" do |centos|
# centos.vm.box = "boxcutter/centos72"
# centos.vm.provision "shell", inline: <<-SHELL
# sudo yum install -y libselinux-python
# SHELL
# end
config.vm.provision "shell", inline: <<-SHELL
sudo yum install -y libselinux-python
test -e /vagrant/tests/roles/ansible-sshd || ln -s /vagrant /vagrant/tests/roles/ansible-sshd
SHELL
config.vm.provision "ansible_local" do |ansible|
# ansible.config_file = "tests/ansible.cfg"
ansible.playbook = "tests/test.yml"
ansible.install = true
end

0
tests/roles/.gitkeep Normal file
View file

View file

@ -1 +0,0 @@
../../.

View file

@ -1,5 +1,5 @@
---
- hosts: localhost
- hosts: all
become: true
roles:
- ansible-sshd