Merge branch 'task/erenfro/remove-yum-cookbook' of psi-jack/yum-zabbix into master
This commit is contained in:
commit
993c8e48b8
7 changed files with 146 additions and 13 deletions
21
.kitchen.docker.yml
Normal file
21
.kitchen.docker.yml
Normal 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:
|
15
.kitchen.yml
15
.kitchen.yml
|
@ -1,21 +1,24 @@
|
|||
---
|
||||
driver:
|
||||
name: docker
|
||||
name: qemu
|
||||
|
||||
verifier:
|
||||
name: inspec
|
||||
|
||||
provisioner:
|
||||
name: chef_zero
|
||||
|
||||
platforms:
|
||||
- name: centos-7.2
|
||||
- name: centos-7.3
|
||||
driver_config:
|
||||
image: centos:7.2.1511
|
||||
image: centos-7.3-chef.qcow2
|
||||
platform: rhel
|
||||
require_chef_omnibus: 12.16.42
|
||||
use_sudo: false
|
||||
hostname: integration.test.test
|
||||
vm_hostname: integration.centos.test
|
||||
require_chef_omnibus: false
|
||||
|
||||
suites:
|
||||
- name: default
|
||||
run_list:
|
||||
- recipe[yum-zabbix::default]
|
||||
attributes:
|
||||
|
||||
|
|
|
@ -2,6 +2,5 @@ source "https://supermarket.chef.io"
|
|||
|
||||
metadata
|
||||
|
||||
cookbook "yum", "~> 3.10.0"
|
||||
cookbook "yum-epel", "~> 0.6.6"
|
||||
cookbook "yum-epel", ">= 2.1.1"
|
||||
|
||||
|
|
8
Gemfile
Normal file
8
Gemfile
Normal 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
|
||||
|
94
chefignore
94
chefignore
|
@ -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
|
||||
|
||||
# Cookbooks #
|
||||
#############
|
||||
CONTRIBUTING
|
||||
CHANGELOG*
|
||||
|
||||
# Strainer #
|
||||
############
|
||||
Colanderfile
|
||||
Strainerfile
|
||||
.colander
|
||||
.strainer
|
||||
|
||||
# Vagrant #
|
||||
###########
|
||||
.vagrant
|
||||
Vagrantfile
|
||||
|
||||
# Travis #
|
||||
##########
|
||||
.travis.yml
|
||||
|
|
11
metadata.rb
11
metadata.rb
|
@ -2,16 +2,17 @@ name 'yum-zabbix'
|
|||
maintainer 'Eric Renfro'
|
||||
maintainer_email 'psi-jack@linux-help.org'
|
||||
license 'Apache 2.0'
|
||||
description 'Installs and configures the NUX Community Desktop Yum Repository'
|
||||
description 'Installs and configures the Zabbix Yum Repository'
|
||||
long_description ''
|
||||
version '0.1.3'
|
||||
version '1.0.0'
|
||||
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'
|
||||
|
||||
%w{ centos redhat oracle scientific }.each do |os|
|
||||
supports os, '>= 5.0.0'
|
||||
supports os, '>= 6.0.0'
|
||||
end
|
||||
|
||||
depends 'yum', '>= 3.2'
|
||||
depends 'yum-epel', '>= 0.0.0'
|
||||
depends 'yum-epel', '>= 2.1.1'
|
||||
|
||||
chef_version '>= 12.1'
|
||||
|
||||
|
|
7
test/integration/default/inspec/default.rb
Normal file
7
test/integration/default/inspec/default.rb
Normal file
|
@ -0,0 +1,7 @@
|
|||
title "YUM Zabbix Repository"
|
||||
|
||||
describe yum.repo('zabbix') do
|
||||
it { should exist }
|
||||
it { should be_enabled }
|
||||
end
|
||||
|
Loading…
Reference in a new issue