opendev
/
puppet-ansible
Code Issues Proposed changes

Put the library file into the role 

Roles can contain embedded library code, which is how roles work when
you distribute them on ansible galaxy. Put the library there and remove
the old location to prepare for standalone modules.

Change-Id: Iaa7906f71bb0a3bc255695e72b6ae061407fa2b8
This commit is contained in:
Monty Taylor 2015-02-22 23:08:10 -05:00
parent 82fc32cb23
commit 36da8fc39b
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
files/library/config_management/puppet → files/roles/puppet/library/puppet
View File

5
manifests/init.pp
View File

@ -43,10 +43,7 @@ class ansible (
} }
file { '/etc/ansible/library': file { '/etc/ansible/library':
ensure => directory, ensure => absent,
recurse => true,
source => 'puppet:///modules/ansible/library',
require => File['/etc/ansible'],
} }
include logrotate include logrotate

2
templates/ansible.cfg.erb
View File

@ -1,4 +1,4 @@
[defaults] [defaults]
hostfile=<%= @ansible_hostfile %> hostfile=<%= @ansible_hostfile %>
library=/usr/share/ansible:/etc/ansible/library library=/usr/share/ansible
log_path=/var/log/ansible.log log_path=/var/log/ansible.log