From: Jiri Stransky <jistr@redhat.com>
Date: Tue, 21 Feb 2017 12:54:06 +0000 (+0100)
Subject: Stop accidentally removing docker-distribution
X-Git-Tag: opnfv-6.0.0~331
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=d12c004bc9c630c756a6b0df351916b9e04b9778;p=apex-puppet-tripleo.git

Stop accidentally removing docker-distribution

By default Puppet does virtual package matching if precise name matching
fails. Docker-distribution RPM "provides" docker-registry:

bash-4.2# rpm -q --whatprovides docker-registry
docker-distribution-2.5.1-1.el7.x86_64

This means that when we wanted to make docker-registry package absent,
we were actually removing docker-distribution instead. This is now fixed
by allow_virtual => false. Only name matching is performed.

Change-Id: I1f93b404085f0bc2b6c063f573c801db6409c0bb
Closes-Bug: #1666459
---

diff --git a/manifests/profile/base/docker_registry.pp b/manifests/profile/base/docker_registry.pp
index ebe84bf..0452575 100644
--- a/manifests/profile/base/docker_registry.pp
+++ b/manifests/profile/base/docker_registry.pp
@@ -38,7 +38,8 @@ class tripleo::profile::base::docker_registry (
 ) {
   # We want a v2 registry
   package{'docker-registry':
-    ensure => absent,
+    ensure        => absent,
+    allow_virtual => false,
   }
   package{'docker-distribution': }
   package{'docker': }