From e712d17078563bf8c8ded3304f38a0746fb8070b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Andr=C3=A9?= <m.andre@redhat.com>
Date: Fri, 6 Jan 2017 17:15:50 +0100
Subject: [PATCH] Move Docker registry setup into its own profile

The new tripleo::profile::base::docker_registry profile sets up
a v2 registry instead of the old, deprecated v1 registry.

Change-Id: I89e14cc2a27299ce4c191d2a823deb0424693831
Depends-On: I1227956a0389497eedc00e4ec817f52be608dc75
(cherry picked from commit 62291b31871f411c193379036964ee222a739064)
---
 .../puppet-stack-config.pp                    | 30 +------------------
 1 file changed, 1 insertion(+), 29 deletions(-)

diff --git a/elements/puppet-stack-config/puppet-stack-config.pp b/elements/puppet-stack-config/puppet-stack-config.pp
index 6653e2fa5..11c6d5a5f 100644
--- a/elements/puppet-stack-config/puppet-stack-config.pp
+++ b/elements/puppet-stack-config/puppet-stack-config.pp
@@ -515,35 +515,7 @@ augeas { 'lvm.conf':
 }
 
 if str2bool(hiera('enable_docker_registry', true)) {
-  package{'docker-registry': }
-  package{'docker': }
-  augeas { 'docker-registry':
-    context => '/files/etc/sysconfig/docker-registry',
-    changes => [
-      'set REGISTRY_PORT 8787',
-      join(['set REGISTRY_ADDRESS ', hiera('controller_host')])
-    ],
-    notify  => Service['docker-registry'],
-  }
-  file_line { 'docker insecure registry':
-    path   => '/etc/sysconfig/docker',
-    line   => join ([
-      'INSECURE_REGISTRY="',
-      '--insecure-registry ', hiera('controller_host'), ':8787 ',
-      '--insecure-registry ', hiera('controller_admin_host'), ':8787"']),
-    match  => 'INSECURE_REGISTRY=',
-    notify => Service['docker'],
-  }
-  service { 'docker-registry':
-    ensure  => running,
-    enable  => true,
-    require => Package['docker-registry'],
-  }
-  service { 'docker':
-    ensure  => running,
-    enable  => true,
-    require => Package['docker'],
-  }
+  include ::tripleo::profile::base::docker_registry
 }
 
 include ::mistral