Skip to content

Commit

Permalink
Merge pull request puppetlabs#145 from sheenaajay/dockerdatatype
Browse files Browse the repository at this point in the history 
(fix for puppetlabs#143 and puppetlabs#144)
  • Loading branch information
@davejrt
davejrt authored Feb 7, 2018
2 parents 67e0fe4 + d7dcd2c commit 23c3e4d
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 19 deletions.
18 changes: 6 additions & 12 deletions manifests/init.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@
Optional[String] $log_level = $docker::params::log_level,
Optional[String] $log_driver = $docker::params::log_driver,
Array $log_opt = $docker::params::log_opt,
Optional[String] $selinux_enabled = $docker::params::selinux_enabled,
Optional[Boolean] $selinux_enabled = $docker::params::selinux_enabled,
Optional[Boolean] $use_upstream_package_source = $docker::params::use_upstream_package_source,
Optional[Boolean] $pin_upstream_package_source = $docker::params::pin_upstream_package_source,
Optional[Integer] $apt_source_pin_level = $docker::params::apt_source_pin_level,
Expand Down Expand Up @@ -426,10 +426,10 @@
Optional[String] $dm_datadev = $docker::params::dm_datadev,
Optional[String] $dm_metadatadev = $docker::params::dm_metadatadev,
Optional[String] $dm_thinpooldev = $docker::params::dm_thinpooldev,
Optional[String] $dm_use_deferred_removal = $docker::params::dm_use_deferred_removal,
Optional[String] $dm_use_deferred_deletion = $docker::params::dm_use_deferred_deletion,
Optional[String] $dm_blkdiscard = $docker::params::dm_blkdiscard,
Optional[String] $dm_override_udev_sync_check = $docker::params::dm_override_udev_sync_check,
Optional[Boolean] $dm_use_deferred_removal = $docker::params::dm_use_deferred_removal,
Optional[Boolean] $dm_use_deferred_deletion = $docker::params::dm_use_deferred_deletion,
Optional[Boolean] $dm_blkdiscard = $docker::params::dm_blkdiscard,
Optional[Boolean] $dm_override_udev_sync_check = $docker::params::dm_override_udev_sync_check,
Boolean $overlay2_override_kernel_check = $docker::params::overlay2_override_kernel_check,
Optional[String] $execdriver = $docker::params::execdriver,
Boolean $manage_package = $docker::params::manage_package,
Expand All @@ -446,7 +446,7 @@
Optional[String] $storage_data_size = $docker::params::storage_data_size,
Optional[String] $storage_min_data_size = $docker::params::storage_min_data_size,
Optional[String] $storage_chunk_size = $docker::params::storage_chunk_size,
Optional[String] $storage_growpart = $docker::params::storage_growpart,
Optional[Boolean] $storage_growpart = $docker::params::storage_growpart,
Optional[String] $storage_auto_extend_pool = $docker::params::storage_auto_extend_pool,
Optional[String] $storage_pool_autoextend_threshold = $docker::params::storage_pool_autoextend_threshold,
Optional[String] $storage_pool_autoextend_percent = $docker::params::storage_pool_autoextend_percent,
Expand Down Expand Up @@ -485,12 +485,6 @@
}
}

if $selinux_enabled {
assert_type(Pattern[/^(true|false)$/], $selinux_enabled) |$a, $b| {
fail translate(('selinux_enabled must be true or false'))
}
}

if $storage_driver {
assert_type(Pattern[/^(aufs|devicemapper|btrfs|overlay|overlay2|vfs|zfs)$/], $storage_driver) |$a, $b| {
fail translate(('Valid values for storage_driver are aufs, devicemapper, btrfs, overlay, overlay2, vfs, zfs.'))
Expand Down
14 changes: 7 additions & 7 deletions spec/classes/docker_spec.rb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,7 @@
context 'with use deferred removal param' do
let(:params) {
{ 'storage_driver' => 'devicemapper',
'dm_use_deferred_removal' => 'true'
'dm_use_deferred_removal' => true
}
}
it { should contain_file(storage_config_file).with_content(/--storage-opt dm\.use_deferred_removal=true/) }
Expand All @@ -499,7 +499,7 @@
context 'with use deferred deletion param' do
let(:params) {
{ 'storage_driver' => 'devicemapper',
'dm_use_deferred_deletion' => 'true'
'dm_use_deferred_deletion' => true
}
}
it { should contain_file(storage_config_file).with_content(/--storage-opt dm\.use_deferred_deletion=true/) }
Expand All @@ -508,7 +508,7 @@
context 'with block discard param' do
let(:params) {
{ 'storage_driver' => 'devicemapper',
'dm_blkdiscard' => 'true'
'dm_blkdiscard' => true
}
}
it { should contain_file(storage_config_file).with_content(/--storage-opt dm\.blkdiscard=true/) }
Expand All @@ -517,7 +517,7 @@
context 'with override udev sync check param' do
let(:params) {
{ 'storage_driver' => 'devicemapper',
'dm_override_udev_sync_check' => 'true'
'dm_override_udev_sync_check' => true
}
}
it { should contain_file(storage_config_file).with_content(/--storage-opt dm\.override_udev_sync_check=true/) }
Expand Down Expand Up @@ -675,7 +675,7 @@
end

context 'with specific selinux_enabled parameter' do
let(:params) { { 'selinux_enabled' => 'true' } }
let(:params) { { 'selinux_enabled' => true } }
it { should contain_file(service_config_file).with_content(/--selinux-enabled=true/) }
end

Expand All @@ -684,7 +684,7 @@
it do
expect {
should contain_package('docker')
}.to raise_error(Puppet::Error, /selinux_enabled must be true or false/)
}.to raise_error(Puppet::Error, /got String/)
end
end

Expand Down Expand Up @@ -766,7 +766,7 @@
end

context 'with storage grow partition' do
let(:params) { { 'storage_growpart' => 'true' }}
let(:params) { { 'storage_growpart' => true }}
it { should contain_file(storage_setup_file).with_content(/^GROWPART=true/) }
end

Expand Down

0 comments on commit 23c3e4d

Please sign in to comment.