Merge pull request from willshersystems/lvalue_fix

Fix for CentOS 6 l_value issue
This commit is contained in:
Matt Willsher 2016-01-24 16:14:07 +00:00
commit 4b13bf4599
7 changed files with 35 additions and 4 deletions

1
.gitignore vendored Normal file
View file

@ -0,0 +1 @@
.vagrant

View file

@ -1,5 +1,6 @@
---
language: c
sudo: required
before_install:
- sudo add-apt-repository -y ppa:ansible/ansible
@ -10,8 +11,6 @@ install:
# Add ansible.cfg to pick up roles path.
- "{ echo '[defaults]'; echo 'roles_path = ../'; } >> ansible.cfg"
- "ansible-galaxy install willshersystems.apt"
script:
# Check the roles syntax
- "ansible-playbook -i tests/inventory tests/test.yml --syntax-check"

29
Vagrantfile vendored Normal file
View file

@ -0,0 +1,29 @@
# vi: set ft=ruby :
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"
end
config.vm.provision "shell", inline: <<-SHELL
sudo yum install -y libselinux-python
SHELL
config.vm.provision "ansible_local" do |ansible|
ansible.playbook = "tests/test.yml"
ansible.install = true
end
end

View file

@ -16,6 +16,7 @@
{% endif %}
{% endmacro %}
{% macro body_option(key,override) %}
{% set value = undefined %}
{% if override is defined %}
{% set value = override %}
{% elif sshd[key] is defined %}

View file

@ -16,6 +16,7 @@
{% endif %}
{% endmacro %}
{% macro body_option(key,override) %}
{% set value = undefined %}
{% if override is defined %}
{% set value = override %}
{% elif sshd[key] is defined %}

1
tests/roles/ansible-sshd Symbolic link
View file

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

View file

@ -1,6 +1,5 @@
---
- hosts: localhost
remote_user: root
become: true
roles:
- ansible-sshd