openstack/puppet-tripleo
Code Issues Proposed changes

Rename controller_admin_vip to controller_admin_host

Browse Source 
Bring change of I53151d4f555d5d161a3e53ce5f022e3bf3b2ffbd into
puppet-tripleo.

Change-Id: I1227956a0389497eedc00e4ec817f52be608dc75
Related-Bug: #1643655
This commit is contained in:
Martin André 2017-01-25 18:12:23 +01:00
parent 4a77eb9e98
commit 2d4015019a
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,21 +19,22 @@
# === Parameters: # === Parameters:
# #
# [*registry_host*] # [*registry_host*]
# (String) IP address on which the Docker registry is listening on # (String) IP address or hostname the Docker registry binds to
# Defaults to hiera('controller_host') # Defaults to hiera('controller_host')
# #
# [*registry_port*] # [*registry_port*]
# (Integer) The port on which the Docker registry is listening on # (Integer) The port on which the Docker registry is listening on
# Defaults to 8787 # Defaults to 8787
# #
# [*controller_admin_vip*] # [*registry_admin_host*]
# (String) VIP of the host # (String) IP address or hostname the Docker registry binds to in the admin
# Defaults to hiera('controller_admin_vip') # network
# Defaults to hiera('controller_admin_host')
# #
class tripleo::profile::base::docker_registry ( class tripleo::profile::base::docker_registry (
$registry_host = hiera('controller_host'), $registry_host = hiera('controller_host'),
$registry_port = 8787, $registry_port = 8787,
$controller_admin_vip = hiera('controller_admin_vip'), $registry_admin_host = hiera('controller_admin_host'),
) { ) {
# We want a v2 registry # We want a v2 registry
package{'docker-registry': package{'docker-registry':
@ -55,7 +56,7 @@ class tripleo::profile::base::docker_registry (
line => join ([ line => join ([
'INSECURE_REGISTRY="', 'INSECURE_REGISTRY="',
'--insecure-registry ', $registry_host, ':', $registry_port, ' ', '--insecure-registry ', $registry_host, ':', $registry_port, ' ',
'--insecure-registry ', $controller_admin_vip, ':', $registry_port, '"']), '--insecure-registry ', $registry_admin_host, ':', $registry_port, '"']),
match => 'INSECURE_REGISTRY=', match => 'INSECURE_REGISTRY=',
require => Package['docker'], require => Package['docker'],
notify => Service['docker'], notify => Service['docker'],