openstack/puppet-tripleo
Code Issues Proposed changes

Merge "Don't install kolla by default"

Browse Source
This commit is contained in:
Zuul
2018-06-09 02:12:54 +00:00
committed by Gerrit Code Review
parent 199ddad31b 291ff8bb3b
commit 0fdf746fd5
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,7 @@
# === Parameters: # === Parameters:
# [*enable_container_images_build*] # [*enable_container_images_build*]
# (Optional) Whether to install tools to build docker container images # (Optional) Whether to install tools to build docker container images
# Defaults to hiera('enable_container_images_build', true) # Defaults to hiera('enable_container_images_build', false)
# #
# [*registry_host*] # [*registry_host*]
# (String) IP address or hostname the Docker registry binds to # (String) IP address or hostname the Docker registry binds to
@@ -36,7 +36,7 @@
# #
# #
class tripleo::profile::base::docker_registry ( class tripleo::profile::base::docker_registry (
$enable_container_images_build = hiera('enable_container_images_build', true), $enable_container_images_build = hiera('enable_container_images_build', false),
# these are used within the config.yaml below # these are used within the config.yaml below
$registry_host = hiera('controller_host'), $registry_host = hiera('controller_host'),
$registry_port = 8787, $registry_port = 8787,

9
releasenotes/notes/nokolla-7898fe76cf623a0c.yaml Normal file
View File

@@ -0,0 +1,9 @@
---
other:
- |
The default for
tripleo::profile::base::docker_registry::enable_container_images_build is
now false by default, so any users relying on this to install
openstack-kolla will need to explicitly set this to true in their local
hieradata.