diff options
| author |   Dan Prince <dprince@redhat.com> | 2017-04-07 16:07:12 -0400 |
|---|---|---|
| committer | Dan Prince <dprince@redhat.com> | 2017-04-07 16:27:03 -0400 |
| commit | 2ec381a47504208bc2192e3fbb570c638886c5bc (patch) | |
| tree | 1f2df4e6e6d42c58fd530da47811cf7dba9eaed3 /templates/docker_distribution/registry_config.yml.erb | |
| parent | b8a11a5d80e4b2f345a7a4d249c1aafcbbf937fe (diff) | |
Use docker profile in docker_registry
The docker_registry profile has resources to configure
the docker service and package. These conflict with the
entries in the tripleo::profile::base::docker class which
exists specifically to manage these resources (and has
unit tests).
This patch removes the duplicate resources and updates
the docker_registry profile to simply include the
base docker profile instead.
This instack-undercloud change below needs to land first.
Depends-On: I6154f4c7435b02b92f6f64687e9ee89d6b86186a
Change-Id: I75c740e7efc6662861c28caeb7fa965ba55438cb
Diffstat (limited to 'templates/docker_distribution/registry_config.yml.erb')
0 files changed, 0 insertions, 0 deletions