diff --git a/examples/librarian/librarian.yaml b/examples/librarian/librarian.yaml index a5731757..79445de5 100644 --- a/examples/librarian/librarian.yaml +++ b/examples/librarian/librarian.yaml @@ -5,7 +5,7 @@ resources: location: {{node}} from: resources/librarian values: - modules_dir: /tmp/x/x/modules + modules_path: /tmp/x/x/modules modules: - name: puppetlabs-ntp version: 4.1.0 diff --git a/resources/librarian/actions/remove.yaml b/resources/librarian/actions/remove.yaml index 42c4616c..c948ead8 100644 --- a/resources/librarian/actions/remove.yaml +++ b/resources/librarian/actions/remove.yaml @@ -1,6 +1,6 @@ - hosts: [{{host}}] sudo: yes tasks: - - file: path={{modules_dir}} state=absent - - file: path={{modules_dir}}/../Puppetfile state=absent + - file: path={{modules_path}} state=absent + - file: path={{modules_path}}/../Puppetfile state=absent - shell: gem uninstall librarian-puppet diff --git a/resources/librarian/actions/run.yaml b/resources/librarian/actions/run.yaml index 1f69649c..391e6f8a 100644 --- a/resources/librarian/actions/run.yaml +++ b/resources/librarian/actions/run.yaml @@ -3,8 +3,8 @@ tasks: # XXX: check apt package http://packages.ubuntu.com/trusty/ruby/librarian-puppet - shell: gem install librarian-puppet --no-ri --no-rdoc - - file: path={{modules_dir}} state=directory + - file: path={{modules_path}} state=directory - template: src={{templates_dir}}/Puppetfile - dest={{modules_dir}}/../Puppetfile - - shell: librarian-puppet install chdir={{modules_dir}} + dest={{modules_path}}/../Puppetfile + - shell: librarian-puppet install chdir={{modules_path}} diff --git a/resources/librarian/meta.yaml b/resources/librarian/meta.yaml index 77213fdd..9d620c11 100644 --- a/resources/librarian/meta.yaml +++ b/resources/librarian/meta.yaml @@ -5,7 +5,7 @@ input: modules: schema: [str] value: [] - modules_dir: + modules_path: schema: str! value: /etc/puppet/modules forge: