summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Stransky <jistr@redhat.com>2017-02-21 13:54:06 +0100
committerJiri Stransky <jistr@redhat.com>2017-02-21 14:01:31 +0100
commitd12c004bc9c630c756a6b0df351916b9e04b9778 (patch)
tree99d9c79dfc7df354b14df534f7f537c679308581
parent47969551159a81cd1a050c3b345892aec0bf7d96 (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
-rw-r--r--manifests/profile/base/docker_registry.pp3
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': }