summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRussell Teague <rteague@redhat.com>2017-02-28 10:49:06 -0500
committerGitHub <noreply@github.com>2017-02-28 10:49:06 -0500
commitc4a6dadabab826a98163efa229136f87d3944053 (patch)
treef25c6e9825f62e707ebf6c0f0d2a717ad812799b
parent1629eb0af60e14f70f942b66a6c4c37e875dabe1 (diff)
parent0319ee8c64dababa1f8606612d140cb5805e4f45 (diff)
downloadopenshift-c4a6dadabab826a98163efa229136f87d3944053.tar.gz
openshift-c4a6dadabab826a98163efa229136f87d3944053.tar.bz2
openshift-c4a6dadabab826a98163efa229136f87d3944053.tar.xz
openshift-c4a6dadabab826a98163efa229136f87d3944053.zip
Merge pull request #3515 from mtnbikenc/registry-pvc-fix
BZ1427009: Correct fact creation for pvc
-rw-r--r--roles/openshift_hosted/tasks/registry/registry.yml5
1 files changed, 3 insertions, 2 deletions
diff --git a/roles/openshift_hosted/tasks/registry/registry.yml b/roles/openshift_hosted/tasks/registry/registry.yml
index 2369c4e2e..dcb1277f3 100644
--- a/roles/openshift_hosted/tasks/registry/registry.yml
+++ b/roles/openshift_hosted/tasks/registry/registry.yml
@@ -77,13 +77,14 @@
when:
- openshift.hosted.registry.storage.kind | default(none) == 'object'
-- name: Set facts for persistent volume
+- name: Update openshift_hosted facts for persistent volumes
set_fact:
+ openshift_hosted_registry_volumes: "{{ openshift_hosted_registry_volumes | union(pvc_volume_mounts) }}"
+ vars:
pvc_volume_mounts:
- name: registry-storage
type: persistentVolumeClaim
claim_name: "{{ openshift.hosted.registry.storage.volume.name }}-claim"
- openshift_hosted_registry_volumes: "{{ openshift_hosted_registry_volumes | union(pvc_volume_mounts) }}"
when:
- openshift.hosted.registry.storage.kind | default(none) in ['nfs', 'openstack']