openstack
/
instack-undercloud
Code Issues Proposed changes

Move Docker registry setup into its own profile 

The new tripleo::profile::base::docker_registry profile sets up
a v2 registry instead of the old, deprecated v1 registry.

Change-Id: I89e14cc2a27299ce4c191d2a823deb0424693831
Depends-On: I1227956a0389497eedc00e4ec817f52be608dc75
(cherry picked from commit 62291b3187)
This commit is contained in:
Martin André 2017-01-06 17:15:50 +01:00 committed by Steve Baker
parent cfeebb1262
commit e712d17078
1 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
elements/puppet-stack-config/puppet-stack-config.pp
View File

@ -515,35 +515,7 @@ augeas { 'lvm.conf':
}
if str2bool(hiera('enable_docker_registry', true)) {
package{'docker-registry': }
package{'docker': }
augeas { 'docker-registry':
context => '/files/etc/sysconfig/docker-registry',
changes => [
'set REGISTRY_PORT 8787',
join(['set REGISTRY_ADDRESS ', hiera('controller_host')])
],
notify => Service['docker-registry'],
}
file_line { 'docker insecure registry':
path => '/etc/sysconfig/docker',
line => join ([
'INSECURE_REGISTRY="',
'--insecure-registry ', hiera('controller_host'), ':8787 ',
'--insecure-registry ', hiera('controller_admin_host'), ':8787"']),
match => 'INSECURE_REGISTRY=',
notify => Service['docker'],
}
service { 'docker-registry':
ensure => running,
enable => true,
require => Package['docker-registry'],
}
service { 'docker':
ensure => running,
enable => true,
require => Package['docker'],
}
include ::tripleo::profile::base::docker_registry
}
include ::mistral