diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-13 22:15:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-13 22:15:16 +0000 |
| commit | 77f45d6bf3f33ff6d0bebaf38a6f1ce1a4f21979 (patch) | |
| tree | 9cdd655ab87580dc0056b5b51c621c5e8d7a7b24 /manifests | |
| parent | 7070bbe0919900b0a15c9feea38e6d4aeacada0c (diff) | |
| parent | 5c8d5fd8ecd5c1a24df256950ad8c8524f6b6e01 (diff) | |
Merge "Make install of kolla optional on the undercloud"
Diffstat (limited to 'manifests')
| -rw-r--r-- | manifests/profile/base/docker_registry.pp | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/manifests/profile/base/docker_registry.pp b/manifests/profile/base/docker_registry.pp index 73fb6e0..cb262d9 100644 --- a/manifests/profile/base/docker_registry.pp +++ b/manifests/profile/base/docker_registry.pp @@ -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'), |