From 2d4015019a02bc7609f359961460494fc890e049 Mon Sep 17 00:00:00 2001
From: Martin André <m.andre@redhat.com>
Date: Wed, 25 Jan 2017 18:12:23 +0100
Subject: Rename controller_admin_vip to controller_admin_host

Bring change of I53151d4f555d5d161a3e53ce5f022e3bf3b2ffbd into
puppet-tripleo.

Change-Id: I1227956a0389497eedc00e4ec817f52be608dc75
Related-Bug: #1643655
---
 manifests/profile/base/docker_registry.pp | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'manifests/profile/base/docker_registry.pp')

diff --git a/manifests/profile/base/docker_registry.pp b/manifests/profile/base/docker_registry.pp
index 05a516d..ebe84bf 100644
--- a/manifests/profile/base/docker_registry.pp
+++ b/manifests/profile/base/docker_registry.pp
@@ -19,21 +19,22 @@
 # === Parameters:
 #
 # [*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')
 #
 # [*registry_port*]
 #  (Integer) The port on which the Docker registry is listening on
 #  Defaults to 8787
 #
-# [*controller_admin_vip*]
-#  (String) VIP of the host
-#  Defaults to hiera('controller_admin_vip')
+# [*registry_admin_host*]
+#  (String) IP address or hostname the Docker registry binds to in the admin
+#  network
+#  Defaults to hiera('controller_admin_host')
 #
 class tripleo::profile::base::docker_registry (
-  $registry_host        = hiera('controller_host'),
-  $registry_port        = 8787,
-  $controller_admin_vip = hiera('controller_admin_vip'),
+  $registry_host       = hiera('controller_host'),
+  $registry_port       = 8787,
+  $registry_admin_host = hiera('controller_admin_host'),
 ) {
   # We want a v2 registry
   package{'docker-registry':
@@ -55,7 +56,7 @@ class tripleo::profile::base::docker_registry (
     line    => join ([
       'INSECURE_REGISTRY="',
       '--insecure-registry ', $registry_host, ':', $registry_port, ' ',
-      '--insecure-registry ', $controller_admin_vip, ':', $registry_port, '"']),
+      '--insecure-registry ', $registry_admin_host, ':', $registry_port, '"']),
     match   => 'INSECURE_REGISTRY=',
     require => Package['docker'],
     notify  => Service['docker'],
-- 
cgit 1.2.3-korg