diff --git a/manifests/init.pp b/manifests/init.pp index 1f646009c7..adfa3aa334 100755 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -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, @@ -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, @@ -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, @@ -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.')) diff --git a/spec/classes/docker_spec.rb b/spec/classes/docker_spec.rb index 8f4d668d18..75c4303418 100755 --- a/spec/classes/docker_spec.rb +++ b/spec/classes/docker_spec.rb @@ -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/) } @@ -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/) } @@ -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/) } @@ -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/) } @@ -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 @@ -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 @@ -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