diff options
| author |   Jiri Stransky <jistr@redhat.com> | 2017-02-21 13:54:06 +0100 |
|---|---|---|
| committer |   Emilien Macchi <emilien@redhat.com> | 2017-02-21 16:08:36 +0000 |
| commit | ce03c7f2359d2b974dc35d3fdad0fb88134ac84f (patch) | |
| tree | e8d6e0a2aa429db8de10d25866feecebaab3f5bf | |
| parent | 83d8153666f1e6502240651dc5d63633603fb5b4 (diff) | |
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
(cherry picked from commit d12c004bc9c630c756a6b0df351916b9e04b9778)
| -rw-r--r-- | manifests/profile/base/docker_registry.pp | 3 |
1 files changed, 2 insertions, 1 deletions
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': } |