From 94a0f7ab9c6e105401fe17c556d3bad193abc999 Mon Sep 17 00:00:00 2001 From: John Bond Date: Fri, 28 Sep 2018 11:53:19 +0100 Subject: [PATCH] use python::pip to install zonecheck --- .fixtures.yml | 23 +++++++---------------- manifests/init.pp | 6 +++--- manifests/remote.pp | 10 +++++----- manifests/zonecheck.pp | 6 ++---- metadata.json | 2 +- spec/classes/02_zonecheck_spec.rb | 18 ++---------------- 6 files changed, 20 insertions(+), 45 deletions(-) diff --git a/.fixtures.yml b/.fixtures.yml index a7b5e40..43e182a 100644 --- a/.fixtures.yml +++ b/.fixtures.yml @@ -1,19 +1,10 @@ fixtures: symlinks: dns: "#{source_dir}" - repositories: - stdlib: - repo: https://github.com/puppetlabs/puppetlabs-stdlib.git - ref: 4.25.1 - concat: - repo: https://github.com/puppetlabs/puppetlabs-concat.git - nsd: - repo: https://github.com/icann-dns/puppet-nsd.git - branch: 0.2.x - knot: - repo: https://github.com/icann-dns/puppet-knot.git - branch: 0.2.x - tea: - repo: https://github.com/icann-dns/puppet-tea.git - python: - repo: https://github.com/stankevich/puppet-python.git + forge_modules: + stdlib: "puppetlabs/stdlib" + concat: "puppetlabs/concat" + knot: "icann/knot" + nsd: "icann/nsd" + tea: "icann/tea" + python: "puppet/python" diff --git a/manifests/init.pp b/manifests/init.pp index 2295e2f..187470b 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -5,13 +5,13 @@ Optional[String] $default_tsig_name = 'NOKEY', Array[String] $default_masters = [], Array[String] $default_provide_xfrs = [], - Optional[Tea::Ipv4] $default_ipv4 = $::dns::params::default_ipv4, - Optional[Tea::Ipv6] $default_ipv6 = $::dns::params::default_ipv6, + Optional[Stdlib::IP::Address::V4] $default_ipv4 = $::dns::params::default_ipv4, + Optional[Stdlib::IP::Address::V6] $default_ipv6 = $::dns::params::default_ipv6, Integer[1,256] $server_count = $::dns::params::server_count, Dns::Daemon $daemon = $::dns::params::daemon, String $nsid = $::dns::params::nsid, String $identity = $::dns::params::identity, - Array[Tea::Ip_address] $ip_addresses = $::dns::params::ip_addresses, + Array[Stdlib::IP::Address] $ip_addresses = $::dns::params::ip_addresses, Array[String] $imports = [], Array[String] $exports = [], Pattern[/^(present|absent)$/] $ensure = 'present', diff --git a/manifests/remote.pp b/manifests/remote.pp index db84893..090f4d1 100644 --- a/manifests/remote.pp +++ b/manifests/remote.pp @@ -1,11 +1,11 @@ # dns::remote # define dns::remote ( - Optional[Variant[Tea::Ipv4, Tea::Ipv4_cidr]] $address4 = undef, - Optional[Variant[Tea::Ipv6, Tea::Ipv6_cidr]] $address6 = undef, - Optional[String] $tsig = undef, - Optional[String] $tsig_name = undef, - Tea::Port $port = 53, + Optional[Stdlib::IP::Address::V4] $address4 = undef, + Optional[Stdlib::IP::Address::V6] $address6 = undef, + Optional[String] $tsig = undef, + Optional[String] $tsig_name = undef, + Stdlib::Port $port = 53, ) { @@nsd::remote { $name: address4 => $address4, diff --git a/manifests/zonecheck.pp b/manifests/zonecheck.pp index 38e7eba..f0f4bb8 100644 --- a/manifests/zonecheck.pp +++ b/manifests/zonecheck.pp @@ -2,7 +2,6 @@ # class dns::zonecheck ( Boolean $enable = true, - String $version = '1.0.18', Tea::Syslog_level $syslog_level = 'error', ) { include ::dns @@ -30,9 +29,8 @@ 'debug' => '-vvvv', default => '-v' } - package {'zonecheck': - ensure => $version, - provider => 'pip', + python::pip {'zonecheck': + ensure => latest, } if $::kernel != 'FreeBSD' { include ::python diff --git a/metadata.json b/metadata.json index 8cb3902..7142cbf 100644 --- a/metadata.json +++ b/metadata.json @@ -19,7 +19,7 @@ {"name":"icann-nsd","version_requirement":">= 0.2.3 <0.3.0"}, {"name":"icann-knot","version_requirement":">= 0.3.5 <0.4.0"}, {"name":"icann-tea","version_requirement":">= 0.2.8 <0.3.0"}, - {"name":"stankevich-python","version_requirement":">= 1.15.0 <2.0.0"} + {"name":"python-python","version_requirement":">= 1.15.0 <3.0.0"} ], "operatingsystem_support": [ { diff --git a/spec/classes/02_zonecheck_spec.rb b/spec/classes/02_zonecheck_spec.rb index 837a389..353c502 100644 --- a/spec/classes/02_zonecheck_spec.rb +++ b/spec/classes/02_zonecheck_spec.rb @@ -24,11 +24,7 @@ let(:params) do { #:enable => true, - #:version => "1.0.14", #:syslog_level => "error", - #:ip_addresses => [], - #:zones => {}, - #:tsig => {}, } end @@ -86,9 +82,8 @@ it { is_expected.to compile.with_all_deps } it { is_expected.to contain_class('dns::zonecheck') } it do - is_expected.to contain_package('zonecheck').with( - 'ensure' => '1.0.18', - 'provider' => 'pip' + is_expected.to contain_python__pip('zonecheck').with( + 'ensure' => 'latest', ) end it do @@ -142,11 +137,6 @@ ).with_content('zone_status_errors=false') end end - context 'version' do - before { params.merge!(version: 'foobar') } - it { is_expected.to compile } - it { is_expected.to contain_package('zonecheck').with_ensure('foobar') } - end context 'syslog_level critical' do before { params.merge!(syslog_level: 'critical') } it { is_expected.to compile } @@ -189,10 +179,6 @@ before { params.merge!(enable: 'foobar') } it { expect { subject.call }.to raise_error(Puppet::Error) } end - context 'version' do - before { params.merge!(version: true) } - it { expect { subject.call }.to raise_error(Puppet::Error) } - end context 'syslog_level' do before { params.merge!(syslog_level: true) } it { expect { subject.call }.to raise_error(Puppet::Error) }