From c386b82f5950f663ac5d322f06bd61a006a6c0e7 Mon Sep 17 00:00:00 2001
From: Bogdan Dobrelya <bdobrelia@mirantis.com>
Date: Thu, 16 Jul 2015 15:43:51 +0200
Subject: [PATCH] Use /var/tmp for librarian puppet storage

Signed-off-by: Bogdan Dobrelya <bdobrelia@mirantis.com>
---
 main.yml                            | 8 ++++----
 solar/solar/core/handlers/puppet.py | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/main.yml b/main.yml
index 9b1ad0f8..e179bc83 100644
--- a/main.yml
+++ b/main.yml
@@ -37,13 +37,13 @@
     - file: path=/etc/puppetlabs/code/ state=directory
     - file: src=/etc/puppet/hiera.yaml dest=/etc/puppetlabs/code/hiera.yaml state=link
     - apt: name=ruby-dev state=present
-    - file: path=/var/lib/puppet/modules state=directory owner=puppet
-    - file: path=/var/lib/puppet/Puppetfile state=touch owner=puppet
+    - file: path=/var/tmp/puppet/modules state=directory owner=puppet
+    - file: path=/var/tmp/puppet/Puppetfile state=touch owner=puppet
     - file: path=/etc/puppet/modules state=absent
     - file: path=/etc/puppetlabs/code/modules state=absent
     - file: path=/etc/puppetlabs/code/hieradata state=absent
-    - file: src=/var/lib/puppet/modules dest=/etc/puppet/modules state=link
-    - file: src=/var/lib/puppet/modules dest=/etc/puppetlabs/code/modules state=link
+    - file: src=/var/tmp/puppet/modules dest=/etc/puppet/modules state=link
+    - file: src=/var/tmp/puppet/modules dest=/etc/puppetlabs/code/modules state=link
     - file: src=/etc/puppet/hieradata dest=/etc/puppetlabs/code/hieradata state=link
     - shell: gem install librarian-puppet --no-ri --no-rdoc
 
diff --git a/solar/solar/core/handlers/puppet.py b/solar/solar/core/handlers/puppet.py
index 50276066..5ddbd1f0 100644
--- a/solar/solar/core/handlers/puppet.py
+++ b/solar/solar/core/handlers/puppet.py
@@ -98,7 +98,7 @@ class LibrarianPuppet(ResourceSSHMixin):
 
         puppetlabs = self._ssh_command(
             self.resource,
-            'sudo', 'cat', '/var/lib/puppet/Puppetfile'
+            'sudo', 'cat', '/var/tmp/puppet/Puppetfile'
         )
 
         git = self.resource.args['git'].value
@@ -134,14 +134,14 @@ class LibrarianPuppet(ResourceSSHMixin):
         self._scp_command(
             self.resource,
             '/tmp/Puppetfile',
-            '/var/lib/puppet/Puppetfile',
+            '/var/tmp/puppet/Puppetfile',
             use_sudo=True
         )
 
         self._ssh_command(
             self.resource,
             'sudo', 'librarian-puppet', 'install',
-            cwd='/var/lib/puppet'
+            cwd='/var/tmp/puppet'
         )