summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-11-27 13:57:04 -0500
committerGitHub <noreply@github.com>2017-11-27 13:57:04 -0500
commite7e699a4201754fe9ccd1b9adffad5be5fff18b3 (patch)
tree006326c2c9644b4b2f17966585ea543e0c1cece9
parent96bc873739197ea6aeb2712d6d26f6e3fd29e0d5 (diff)
parent9d5bb8d5e214b1ed9368f9b1d500fb424c6533c5 (diff)
downloadopenshift-e7e699a4201754fe9ccd1b9adffad5be5fff18b3.tar.gz
openshift-e7e699a4201754fe9ccd1b9adffad5be5fff18b3.tar.bz2
openshift-e7e699a4201754fe9ccd1b9adffad5be5fff18b3.tar.xz
openshift-e7e699a4201754fe9ccd1b9adffad5be5fff18b3.zip
Merge pull request #6271 from jarrpa/glusterblock-fix
GlusterFS: Remove extraneous line from glusterblock template
-rw-r--r--roles/openshift_storage_glusterfs/files/v3.7/glusterblock-provisioner.yml1
-rw-r--r--roles/openshift_storage_glusterfs/files/v3.8/glusterblock-provisioner.yml1
2 files changed, 0 insertions, 2 deletions
diff --git a/roles/openshift_storage_glusterfs/files/v3.7/glusterblock-provisioner.yml b/roles/openshift_storage_glusterfs/files/v3.7/glusterblock-provisioner.yml
index 9c1409dee..63dd5cce6 100644
--- a/roles/openshift_storage_glusterfs/files/v3.7/glusterblock-provisioner.yml
+++ b/roles/openshift_storage_glusterfs/files/v3.7/glusterblock-provisioner.yml
@@ -83,7 +83,6 @@ objects:
containers:
- name: glusterblock-provisioner
image: ${IMAGE_NAME}:${IMAGE_VERSION}
- image: gluster/glusterblock-provisioner:latest
imagePullPolicy: IfNotPresent
env:
- name: PROVISIONER_NAME
diff --git a/roles/openshift_storage_glusterfs/files/v3.8/glusterblock-provisioner.yml b/roles/openshift_storage_glusterfs/files/v3.8/glusterblock-provisioner.yml
index 9c1409dee..63dd5cce6 100644
--- a/roles/openshift_storage_glusterfs/files/v3.8/glusterblock-provisioner.yml
+++ b/roles/openshift_storage_glusterfs/files/v3.8/glusterblock-provisioner.yml
@@ -83,7 +83,6 @@ objects:
containers:
- name: glusterblock-provisioner
image: ${IMAGE_NAME}:${IMAGE_VERSION}
- image: gluster/glusterblock-provisioner:latest
imagePullPolicy: IfNotPresent
env:
- name: PROVISIONER_NAME