diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-09 16:39:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-09 16:39:10 -0400 |
| commit | f555b4c341ff96d3c4f6bd86919c1a47b1193b0e (patch) | |
| tree | 4300cedf15cc9e94c8e35b07199fd7b7a5220276 /roles/openshift_hosted | |
| parent | 4a87e79b695c08392cebc20135a2e38300863d18 (diff) | |
| parent | af64e08020e94566f27e4f44b48d485b37b236c1 (diff) | |
| download | openshift-f555b4c341ff96d3c4f6bd86919c1a47b1193b0e.tar.gz openshift-f555b4c341ff96d3c4f6bd86919c1a47b1193b0e.tar.bz2 openshift-f555b4c341ff96d3c4f6bd86919c1a47b1193b0e.tar.xz openshift-f555b4c341ff96d3c4f6bd86919c1a47b1193b0e.zip | |
Merge pull request #2268 from abutcher/ansible-2.2
Ansible 2.2 Support
Diffstat (limited to 'roles/openshift_hosted')
| -rw-r--r-- | roles/openshift_hosted/tasks/registry/registry.yml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_hosted/tasks/registry/registry.yml b/roles/openshift_hosted/tasks/registry/registry.yml index fc037ceda..b28974236 100644 --- a/roles/openshift_hosted/tasks/registry/registry.yml +++ b/roles/openshift_hosted/tasks/registry/registry.yml @@ -50,7 +50,9 @@ when: replicas | int > 0 - include: storage/object_storage.yml + static: no when: replicas | int > 0 and openshift.hosted.registry.storage.kind | default(none) == 'object' - include: storage/persistent_volume.yml + static: no when: replicas | int > 0 and openshift.hosted.registry.storage.kind | default(none) in ['nfs', 'openstack'] |