From d4085e4c52c951c2f69b5647b4b762264cf6943b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Ole=C5=9B?= <loles@mirantis.com>
Date: Sun, 11 Oct 2015 22:10:16 +0200
Subject: [PATCH] Do not install librarian. Hiera does not use redis anymore

---
 bootstrap/playbooks/files/hiera.yaml  | 6 ------
 bootstrap/playbooks/tasks/puppet.yaml | 3 ---
 2 files changed, 9 deletions(-)

diff --git a/bootstrap/playbooks/files/hiera.yaml b/bootstrap/playbooks/files/hiera.yaml
index ce4fc6e0..ae2b2afa 100644
--- a/bootstrap/playbooks/files/hiera.yaml
+++ b/bootstrap/playbooks/files/hiera.yaml
@@ -1,16 +1,10 @@
 :backends:
   - yaml
-  #- redis
   #- json
 :yaml:
   :datadir: /etc/puppet/hieradata
 :json:
   :datadir: /etc/puppet/hieradata
-:redis:
-  :port: 6379
-  :db: 0
-  :host: localhost
-  :deserialize: :json
 :hierarchy:
   - "%{resource_name}"
   - resource
diff --git a/bootstrap/playbooks/tasks/puppet.yaml b/bootstrap/playbooks/tasks/puppet.yaml
index 91542c57..8a8f566b 100644
--- a/bootstrap/playbooks/tasks/puppet.yaml
+++ b/bootstrap/playbooks/tasks/puppet.yaml
@@ -6,8 +6,6 @@
 - shell: apt-get update
 
 - apt: name=puppet state=present
-- git: repo=https://github.com/CGenie/hiera-redis dest=/root/hiera-redis
-- shell: gem build hiera-redis.gemspec && gem install hiera-redis-3.0.0.gem chdir=/root/hiera-redis
 - template: src=files/hiera.yaml dest=/etc/puppet/hiera.yaml
 - file: path=/etc/puppet/hieradata state=directory
 # Make paths puppet 4 compatible
@@ -21,4 +19,3 @@
 - 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