summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-10-10 11:52:41 -0400
committerScott Dodson <sdodson@redhat.com>2016-10-10 11:53:11 -0400
commit492a513a253eb7a61b47f312f1002a62c7a7bfb0 (patch)
tree2d1e6bfd32619852ff4a088754ced5ff10f77a4d
parent2cf43b8cf6a2f925b03585c16dbf451cb4cbb23c (diff)
downloadopenshift-492a513a253eb7a61b47f312f1002a62c7a7bfb0.tar.gz
openshift-492a513a253eb7a61b47f312f1002a62c7a7bfb0.tar.bz2
openshift-492a513a253eb7a61b47f312f1002a62c7a7bfb0.tar.xz
openshift-492a513a253eb7a61b47f312f1002a62c7a7bfb0.zip
Fix config and namespace for registry volume detection
-rw-r--r--roles/openshift_hosted/tasks/registry/storage/persistent_volume.yml11
1 files changed, 9 insertions, 2 deletions
diff --git a/roles/openshift_hosted/tasks/registry/storage/persistent_volume.yml b/roles/openshift_hosted/tasks/registry/storage/persistent_volume.yml
index 60eefd71a..0172f5ca0 100644
--- a/roles/openshift_hosted/tasks/registry/storage/persistent_volume.yml
+++ b/roles/openshift_hosted/tasks/registry/storage/persistent_volume.yml
@@ -3,7 +3,11 @@
registry_volume_claim: "{{ openshift.hosted.registry.storage.volume.name }}-claim"
- name: Determine if volume is already attached to dc/docker-registry
- command: "{{ openshift.common.client_binary }} get -o template dc/docker-registry --template=\\{\\{.spec.template.spec.volumes\\}\\} --output-version=v1"
+ command: >
+ {{ openshift.common.client_binary }}
+ --config={{ openshift_hosted_kubeconfig }}
+ --namespace={{ openshift.hosted.registry.namespace | default('default') }}
+ get -o template dc/docker-registry --template=\\{\\{.spec.template.spec.volumes\\}\\} --output-version=v1
changed_when: false
failed_when: false
register: registry_volumes_output
@@ -13,7 +17,10 @@
- name: Add volume to dc/docker-registry
command: >
- {{ openshift.common.client_binary }} volume dc/docker-registry
+ {{ openshift.common.client_binary }}
+ --config={{ openshift_hosted_kubeconfig }}
+ --namespace={{ openshift.hosted.registry.namespace | default('default') }}
+ volume dc/docker-registry
--add --overwrite -t persistentVolumeClaim --claim-name={{ registry_volume_claim }}
--name=registry-storage
when: not volume_attached | bool