Use modules_path name

This commit is contained in:
Łukasz Oleś 2015-10-13 12:34:51 +02:00
parent 82d81154b7
commit 585eb50291
4 changed files with 7 additions and 7 deletions

View File

@ -5,7 +5,7 @@ resources:
location: {{node}} location: {{node}}
from: resources/librarian from: resources/librarian
values: values:
modules_dir: /tmp/x/x/modules modules_path: /tmp/x/x/modules
modules: modules:
- name: puppetlabs-ntp - name: puppetlabs-ntp
version: 4.1.0 version: 4.1.0

View File

@ -1,6 +1,6 @@
- hosts: [{{host}}] - hosts: [{{host}}]
sudo: yes sudo: yes
tasks: tasks:
- file: path={{modules_dir}} state=absent - file: path={{modules_path}} state=absent
- file: path={{modules_dir}}/../Puppetfile state=absent - file: path={{modules_path}}/../Puppetfile state=absent
- shell: gem uninstall librarian-puppet - shell: gem uninstall librarian-puppet

View File

@ -3,8 +3,8 @@
tasks: tasks:
# XXX: check apt package http://packages.ubuntu.com/trusty/ruby/librarian-puppet # XXX: check apt package http://packages.ubuntu.com/trusty/ruby/librarian-puppet
- shell: gem install librarian-puppet --no-ri --no-rdoc - shell: gem install librarian-puppet --no-ri --no-rdoc
- file: path={{modules_dir}} state=directory - file: path={{modules_path}} state=directory
- template: - template:
src={{templates_dir}}/Puppetfile src={{templates_dir}}/Puppetfile
dest={{modules_dir}}/../Puppetfile dest={{modules_path}}/../Puppetfile
- shell: librarian-puppet install chdir={{modules_dir}} - shell: librarian-puppet install chdir={{modules_path}}

View File

@ -5,7 +5,7 @@ input:
modules: modules:
schema: [str] schema: [str]
value: [] value: []
modules_dir: modules_path:
schema: str! schema: str!
value: /etc/puppet/modules value: /etc/puppet/modules
forge: forge: