openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Split docker options and insecure registry"

This commit is contained in:
Jenkins 2017-06-28 13:50:48 +00:00 committed by Gerrit Code Review
parent f99b72a686 ee53019298
commit 669f0dfe04
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
manifests/profile/base/docker.pp
View File

@ -89,22 +89,34 @@ class tripleo::profile::base::docker (
require => Package['docker'],
}
if $docker_options {
$options_changes = [ "set OPTIONS '\"${docker_options}\"'" ]
} else {
$options_changes = [ 'rm OPTIONS' ]
}
augeas { 'docker-sysconfig-options':
lens => 'Shellvars.lns',
incl => '/etc/sysconfig/docker',
changes => $options_changes,
subscribe => Package['docker'],
notify => Service['docker'],
}
if $insecure_registry {
if $docker_namespace == undef {
fail('You must provide a $docker_namespace in order to configure insecure registry')
}
$namespace = strip($docker_namespace.split('/')[0])
$changes = [ "set INSECURE_REGISTRY '\"--insecure-registry ${namespace}\"'",
"set OPTIONS '\"${docker_options}\"'" ]
$registry_changes = [ "set INSECURE_REGISTRY '\"--insecure-registry ${namespace}\"'" ]
} else {
$changes = [ 'rm INSECURE_REGISTRY',
"set OPTIONS '\"${docker_options}\"'" ]
$registry_changes = [ 'rm INSECURE_REGISTRY' ]
}
augeas { 'docker-sysconfig':
augeas { 'docker-sysconfig-registry':
lens => 'Shellvars.lns',
incl => '/etc/sysconfig/docker',
changes => $changes,
changes => $registry_changes,
subscribe => Package['docker'],
notify => Service['docker'],
}

9
spec/classes/tripleo_profile_base_docker_spec.rb
View File

@ -27,8 +27,7 @@ describe 'tripleo::profile::base::docker' do
it { is_expected.to contain_package('docker') }
it { is_expected.to contain_service('docker') }
it {
is_expected.to contain_augeas('docker-sysconfig').with_changes([
'rm INSECURE_REGISTRY',
is_expected.to contain_augeas('docker-sysconfig-options').with_changes([
"set OPTIONS '\"--log-driver=journald --signature-verification=false\"'",
])
}
@ -45,9 +44,8 @@ describe 'tripleo::profile::base::docker' do
it { is_expected.to contain_package('docker') }
it { is_expected.to contain_service('docker') }
it {
is_expected.to contain_augeas('docker-sysconfig').with_changes([
is_expected.to contain_augeas('docker-sysconfig-registry').with_changes([
"set INSECURE_REGISTRY '\"--insecure-registry foo:8787\"'",
"set OPTIONS '\"--log-driver=journald --signature-verification=false\"'",
])
}
end
@ -85,8 +83,7 @@ describe 'tripleo::profile::base::docker' do
it { is_expected.to contain_package('docker') }
it { is_expected.to contain_service('docker') }
it {
is_expected.to contain_augeas('docker-sysconfig').with_changes([
"rm INSECURE_REGISTRY",
is_expected.to contain_augeas('docker-sysconfig-options').with_changes([
"set OPTIONS '\"--log-driver=syslog\"'",
])
}