From aa38d3e1b1e72b5d7ff26bb1206c0cdb95aa41ca Mon Sep 17 00:00:00 2001 From: fsalum Date: Wed, 19 Feb 2014 22:58:09 -0800 Subject: [PATCH] Forge Release 0.0.11 --- .gitignore | 4 ++++ CHANGELOG | 4 ++++ Modulefile | 2 +- Puppetfile | 2 ++ Vagrantfile | 18 ++++++++++++++++++ tests/init.pp | 12 +++++++++--- 6 files changed, 38 insertions(+), 4 deletions(-) create mode 100644 Puppetfile create mode 100644 Vagrantfile diff --git a/.gitignore b/.gitignore index 9008ca4..ab1486e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,6 @@ pkg/ Gemfile.lock +.vagrant +.librarian +.tmp +Puppetfile.lock diff --git a/CHANGELOG b/CHANGELOG index d4634a9..02800f9 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -4,6 +4,10 @@ Release notes for the fsalum-redis module. ------------------------------------------ +#### 0.0.11 - 2014-02-19 + +* system_sysctl parameter for redis class (@tehmaspc) + #### 0.0.10 - 2014-02-19 * Allow conf_bind to be unset (@stevelacey) diff --git a/Modulefile b/Modulefile index 286cb6e..3d9432e 100644 --- a/Modulefile +++ b/Modulefile @@ -1,5 +1,5 @@ name 'fsalum-redis' -version '0.0.10' +version '0.0.11' source 'git://github.com/fsalum/puppet-redis.git' author 'Felipe Salum' license 'Apache License, Version 2.0' diff --git a/Puppetfile b/Puppetfile new file mode 100644 index 0000000..22d91f0 --- /dev/null +++ b/Puppetfile @@ -0,0 +1,2 @@ +mod "redis", + :git => "git://github.com/fsalum/puppet-redis.git" diff --git a/Vagrantfile b/Vagrantfile new file mode 100644 index 0000000..2c687ec --- /dev/null +++ b/Vagrantfile @@ -0,0 +1,18 @@ +VAGRANTFILE_API_VERSION = "2" +Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| + config.vbguest.auto_update = false + config.hostmanager.enabled = false + + config.vm.define 'redis' do |node| + node.vm.box = "centos65" + node.vm.hostname = "redis.local" + node.vm.network :private_network, ip: "192.168.100.100" + node.vm.provision :shell, :inline => "yum install -y git && gem install librarian-puppet --no-ri --no-rdoc" + node.vm.provision :shell, :inline => "cd /vagrant ; librarian-puppet install --clean --path /etc/puppet/modules" + node.vm.provision :puppet do |puppet| + puppet.manifests_path = ["vm", "/etc/puppet/modules/redis/tests"] + puppet.manifest_file = "init.pp" + end + end + +end diff --git a/tests/init.pp b/tests/init.pp index d0fde4a..45824e6 100644 --- a/tests/init.pp +++ b/tests/init.pp @@ -1,8 +1,14 @@ node default { + package { 'epel-release': + ensure => present, + source => 'http://dl.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm', + provider => rpm, + } + class { 'redis': - conf_port => '6379', - conf_bind => '0.0.0.0', + conf_port => '6379', + conf_bind => '0.0.0.0', + system_sysctl => true, } -}