aboutsummaryrefslogtreecommitdiffstats
path: root/manifests/profile
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-11 02:25:15 +0000
committerGerrit Code Review <review@openstack.org>2017-04-11 02:25:15 +0000
commitdc6eedcb50b4ddbd0ef27e6cc24e2d2889ae0985 (patch)
tree395efc662c00b40720ed36db45cb5d8cbdf196bd /manifests/profile
parentf808cfa65a6aa699c5c15c9560c268b046ca7d3e (diff)
parent2ec381a47504208bc2192e3fbb570c638886c5bc (diff)
Merge "Use docker profile in docker_registry"
Diffstat (limited to 'manifests/profile')
-rw-r--r--manifests/profile/base/docker_registry.pp9
1 files changed, 3 insertions, 6 deletions
diff --git a/manifests/profile/base/docker_registry.pp b/manifests/profile/base/docker_registry.pp
index 2f1783d..73fb6e0 100644
--- a/manifests/profile/base/docker_registry.pp
+++ b/manifests/profile/base/docker_registry.pp
@@ -36,13 +36,15 @@ class tripleo::profile::base::docker_registry (
$registry_port = 8787,
$registry_admin_host = hiera('controller_admin_host'),
) {
+
+ include ::tripleo::profile::base::docker
+
# We want a v2 registry
package{'docker-registry':
ensure => absent,
allow_virtual => false,
}
package{'docker-distribution': }
- package{'docker': }
package{'openstack-kolla': }
file { '/etc/docker-distribution/registry/config.yml' :
ensure => file,
@@ -68,9 +70,4 @@ class tripleo::profile::base::docker_registry (
enable => true,
require => Package['docker-distribution'],
}
- service { 'docker':
- ensure => running,
- enable => true,
- require => Package['docker'],
- }
}