From d5728ef0b1b6fe86642aaa350f454926da8ff691 Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Thu, 1 Nov 2018 14:50:23 +1300
Subject: [PATCH] Pass DockerRegistryMirror to prepare

This is required to fix bug #1800958 so that DockerRegistryMirror is
available to make mirror requests during prepare.

Change-Id: If896c22bf449a3ac91ca363648f84dd5b9aef227
---
 puppet/services/container-image-prepare.j2.yaml | 6 ++++++
 puppet/services/docker.yaml                     | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/puppet/services/container-image-prepare.j2.yaml b/puppet/services/container-image-prepare.j2.yaml
index 426b162ca5..f427a13aa1 100644
--- a/puppet/services/container-image-prepare.j2.yaml
+++ b/puppet/services/container-image-prepare.j2.yaml
@@ -53,6 +53,11 @@ parameters:
         The mechanism drivers for the Neutron tenant network.
     type: comma_delimited_list
 
+  DockerRegistryMirror:
+    description: Optional. Mirror to use for registry docker.io
+    default: ''
+    type: string
+
 {% for role in roles %}
   # Parameters generated for {{role.name}} Role
   {{role.name}}Services:
@@ -97,6 +102,7 @@ outputs:
                   ContainerImagePrepare: {get_param: ContainerImagePrepare}
                   DockerInsecureRegistryAddress: {get_param: DockerInsecureRegistryAddress}
                   NeutronMechanismDrivers: {get_param: NeutronMechanismDrivers}
+                  DockerRegistryMirror: {get_param: DockerRegistryMirror}
 {% for role in roles %}
                   {{role.name}}Services: {get_param: {{role.name}}Services}
                   {{role.name}}Count: {get_param: {{role.name}}Count}
diff --git a/puppet/services/docker.yaml b/puppet/services/docker.yaml
index 3acc11a288..92d08024e0 100644
--- a/puppet/services/docker.yaml
+++ b/puppet/services/docker.yaml
@@ -11,7 +11,7 @@ parameters:
     type: comma_delimited_list
     default: []
   DockerRegistryMirror:
-    description: Optional. Configure a registry-mirror in the /etc/docker/daemon.json file.
+    description: Optional. Mirror to use for registry docker.io
     default: ''
     type: string
   EndpointMap: