summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-02 14:14:22 -0700
committerGitHub <noreply@github.com>2017-10-02 14:14:22 -0700
commitd937aa5981afa9133b1a160329d36b763803f402 (patch)
tree03f6dad31a005bdb21e3b81e1d6354c267c50f8f
parentaf20ba9f9dd455aee9ce4978078a3bcd90c12b24 (diff)
parent0ca3358e01bf0434280f2d99d4206155ef3008aa (diff)
downloadopenshift-d937aa5981afa9133b1a160329d36b763803f402.tar.gz
openshift-d937aa5981afa9133b1a160329d36b763803f402.tar.bz2
openshift-d937aa5981afa9133b1a160329d36b763803f402.tar.xz
openshift-d937aa5981afa9133b1a160329d36b763803f402.zip
Merge pull request #5562 from ttindell2/master
Automatic merge from submit-queue. Fix Heketi Deployment without external registry access #5550 Updated task to use the --image flag. The Image will now be set to: {{ glusterfs_heketi_image}}:{{ glusterfs_heketi_version }} This means that the user can specify an internal registry if needed. Created ticket with heketi: heketi/heketi#870
-rw-r--r--roles/openshift_storage_glusterfs/tasks/heketi_deploy_part2.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_storage_glusterfs/tasks/heketi_deploy_part2.yml b/roles/openshift_storage_glusterfs/tasks/heketi_deploy_part2.yml
index 54a6dd7c3..074904bec 100644
--- a/roles/openshift_storage_glusterfs/tasks/heketi_deploy_part2.yml
+++ b/roles/openshift_storage_glusterfs/tasks/heketi_deploy_part2.yml
@@ -1,6 +1,6 @@
---
- name: Create heketi DB volume
- command: "{{ glusterfs_heketi_client }} setup-openshift-heketi-storage --listfile /tmp/heketi-storage.json"
+ command: "{{ glusterfs_heketi_client }} setup-openshift-heketi-storage --image {{ glusterfs_heketi_image}}:{{ glusterfs_heketi_version }} --listfile /tmp/heketi-storage.json"
register: setup_storage
- name: Copy heketi-storage list