Merge branch 'task/erenfro/remove-yum-cookbook' of Linux-Help/cookbook-yum-zabbix into master

This commit is contained in:
Eric Renfro 2017-02-06 00:57:47 -05:00 committed by Gogs
commit 299e7e4455
7 changed files with 146 additions and 13 deletions

21
.kitchen.docker.yml Normal file
View file

@ -0,0 +1,21 @@
---
driver:
name: docker
provisioner:
name: chef_zero
platforms:
- name: centos-7.2
driver_config:
image: centos:7.2.1511
platform: rhel
require_chef_omnibus: 12.16.42
use_sudo: false
hostname: integration.test.test
suites:
- name: default
run_list:
- recipe[yum-zabbix::default]
attributes:

View file

@ -1,21 +1,24 @@
--- ---
driver: driver:
name: docker name: qemu
verifier:
name: inspec
provisioner: provisioner:
name: chef_zero name: chef_zero
platforms: platforms:
- name: centos-7.2 - name: centos-7.3
driver_config: driver_config:
image: centos:7.2.1511 image: centos-7.3-chef.qcow2
platform: rhel platform: rhel
require_chef_omnibus: 12.16.42 vm_hostname: integration.centos.test
use_sudo: false require_chef_omnibus: false
hostname: integration.test.test
suites: suites:
- name: default - name: default
run_list: run_list:
- recipe[yum-zabbix::default] - recipe[yum-zabbix::default]
attributes: attributes:

View file

@ -2,6 +2,5 @@ source "https://supermarket.chef.io"
metadata metadata
cookbook "yum", "~> 3.10.0" cookbook "yum-epel", ">= 2.1.1"
cookbook "yum-epel", "~> 0.6.6"

8
Gemfile Normal file
View file

@ -0,0 +1,8 @@
source 'https://rubygems.org'
group ":integration" do
gem "chefspec", '>= 3.1'
gem "berkshelf", '>= 5.2.0'
gem 'kitchen-qemu'
end

View file

@ -1 +1,95 @@
# Put files/directories that should be ignored in this file when uploading
# or sharing to the community site.
# Lines that start with '# ' are comments.
# OS generated files #
######################
.DS_Store
Icon?
nohup.out
ehthumbs.db
Thumbs.db
# SASS #
########
.sass-cache
# EDITORS #
###########
\#*
.#*
*~
*.sw[a-z]
*.bak
REVISION
TAGS*
tmtags
*_flymake.*
*_flymake
*.tmproj
.project
.settings
mkmf.log
## COMPILED ##
##############
a.out
*.o
*.pyc
*.so
*.com
*.class
*.dll
*.exe
*/rdoc/
# Testing #
###########
.watchr
.rspec
spec/*
spec/fixtures/*
test/*
features/*
Guardfile
Procfile
# SCM #
#######
.git
*/.git
.gitignore
.gitmodules
.gitconfig
.gitattributes
.svn
*/.bzr/*
*/.hg/*
*/.svn/*
# Berkshelf #
#############
cookbooks/*
tmp
.kitchen .kitchen
# Cookbooks #
#############
CONTRIBUTING
CHANGELOG*
# Strainer #
############
Colanderfile
Strainerfile
.colander
.strainer
# Vagrant #
###########
.vagrant
Vagrantfile
# Travis #
##########
.travis.yml

View file

@ -2,16 +2,17 @@ name 'yum-zabbix'
maintainer 'Eric Renfro' maintainer 'Eric Renfro'
maintainer_email 'psi-jack@linux-help.org' maintainer_email 'psi-jack@linux-help.org'
license 'Apache 2.0' license 'Apache 2.0'
description 'Installs and configures the NUX Community Desktop Yum Repository' description 'Installs and configures the Zabbix Yum Repository'
long_description '' long_description ''
version '0.1.3' version '1.0.0'
issues_url 'https://git.linux-help.org/Linux-Help/cookbook-yum-zabbix/issues' issues_url 'https://git.linux-help.org/Linux-Help/cookbook-yum-zabbix/issues'
source_url 'https://git.linux-help.org/Linux-Help/cookbook-yum-zabbix' source_url 'https://git.linux-help.org/Linux-Help/cookbook-yum-zabbix'
%w{ centos redhat oracle scientific }.each do |os| %w{ centos redhat oracle scientific }.each do |os|
supports os, '>= 5.0.0' supports os, '>= 6.0.0'
end end
depends 'yum', '>= 3.2' depends 'yum-epel', '>= 2.1.1'
depends 'yum-epel', '>= 0.0.0'
chef_version '>= 12.1'

View file

@ -0,0 +1,7 @@
title "YUM Zabbix Repository"
describe yum.repo('zabbix') do
it { should exist }
it { should be_enabled }
end