openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Make install of kolla optional on the undercloud"

This commit is contained in:
Jenkins 2017-04-13 22:15:15 +00:00 committed by Gerrit Code Review
parent 7070bbe091 5c8d5fd8ec
commit 77f45d6bf3
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
manifests/profile/base/docker_registry.pp
View File

@ -31,10 +31,15 @@
# network
# Defaults to hiera('controller_admin_host')
#
# [*enable_container_images_build*]
# (Optional) Whether to install tools to build docker container images
# Defaults to hiera('enable_container_images_build', true)
#
class tripleo::profile::base::docker_registry (
$registry_host = hiera('controller_host'),
$registry_port = 8787,
$registry_admin_host = hiera('controller_admin_host'),
$registry_host = hiera('controller_host'),
$registry_port = 8787,
$registry_admin_host = hiera('controller_admin_host'),
$enable_container_images_build = hiera('enable_container_images_build', true),
) {
include ::tripleo::profile::base::docker
@ -45,7 +50,9 @@ class tripleo::profile::base::docker_registry (
allow_virtual => false,
}
package{'docker-distribution': }
package{'openstack-kolla': }
if str2bool($enable_container_images_build) {
package{'openstack-kolla': }
}
file { '/etc/docker-distribution/registry/config.yml' :
ensure => file,
content => template('tripleo/docker_distribution/registry_config.yml.erb'),