x/solar
Code Issues Proposed changes

Do not install librarian. Hiera does not use redis anymore

Browse Source
This commit is contained in:
Łukasz Oleś 2015-10-11 22:10:16 +02:00
parent 2528c1bb2a
commit d4085e4c52
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bootstrap/playbooks/files/hiera.yaml
View File

@ -1,16 +1,10 @@
:backends: :backends:
- yaml - yaml
#- redis
#- json #- json
:yaml: :yaml:
:datadir: /etc/puppet/hieradata :datadir: /etc/puppet/hieradata
:json: :json:
:datadir: /etc/puppet/hieradata :datadir: /etc/puppet/hieradata
:redis:
:port: 6379
:db: 0
:host: localhost
:deserialize: :json
:hierarchy: :hierarchy:
- "%{resource_name}" - "%{resource_name}"
- resource - resource

3
bootstrap/playbooks/tasks/puppet.yaml
View File

@ -6,8 +6,6 @@
- shell: apt-get update - shell: apt-get update
- apt: name=puppet state=present - 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 - template: src=files/hiera.yaml dest=/etc/puppet/hiera.yaml
- file: path=/etc/puppet/hieradata state=directory - file: path=/etc/puppet/hieradata state=directory
# Make paths puppet 4 compatible # 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/puppet/modules state=link
- file: src=/var/tmp/puppet/modules dest=/etc/puppetlabs/code/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 - file: src=/etc/puppet/hieradata dest=/etc/puppetlabs/code/hieradata state=link
- shell: gem install librarian-puppet --no-ri --no-rdoc