Refactor gluster image to use oreg_url

This commit refactors various gluster component image
variables to utilize oreg_url.  This commit also
refactors filter plugin to make etcd_image filter reusable.

roles/etcd/defaults/main.yaml

@@ -12,11 +12,11 @@ l_etcd_static_pod: "{{ not (r_etcd_common_skip_command_shim is defined and r_etc
 r_etcd_common_etcd_runtime: "{{ 'runc' if l_is_etcd_system_container else ('static_pod' if l_etcd_static_pod else ('docker' if openshift_is_containerized else 'host')) }}"
 
 r_etcd_default_version: "3.2.15"
-# lib_utils_oo_etcd_image is a custom filter defined in roles/lib_utils/filter_plugins/oo_filters.py
+# lib_utils_oo_oreg_image is a custom filter defined in roles/lib_utils/filter_plugins/oo_filters.py
 # This filter attempts to combine oreg_url host with project/component from etcd_image_dict.
 # "oreg.example.com/openshift3/ose-${component}:${version}"
 # becomes "oreg.example.com/rhel7/etcd:{{ r_etcd_upgrade_version | default(r_etcd_default_version) }}"
-osm_etcd_image: "{{ etcd_image_dict[openshift_deployment_type] | lib_utils_oo_etcd_image((oreg_url | default('None'))) }}"
+osm_etcd_image: "{{ etcd_image_dict[openshift_deployment_type] | lib_utils_oo_oreg_image((oreg_url | default('None'))) }}"
 etcd_image_dict:
   origin: "quay.io/coreos/etcd:v{{ r_etcd_upgrade_version | default(r_etcd_default_version) }}"
   openshift-enterprise: "registry.access.redhat.com/rhel7/etcd:{{ r_etcd_upgrade_version | default(r_etcd_default_version) }}"

roles/lib_utils/action_plugins/sanity_checks.py

@@ -81,6 +81,26 @@ REMOVED_VARIABLES = (
     ('openshift_web_console_prefix', 'openshift_web_console_image'),
     ('openshift_web_console_version', 'openshift_web_console_image'),
     ('openshift_web_console_image_name', 'openshift_web_console_image'),
+    ('openshift_storage_glusterfs_version', 'openshift_storage_glusterfs_image'),
+    ('openshift_storage_glusterfs_block_version', 'openshift_storage_glusterfs_block_image'),
+    ('openshift_storage_glusterfs_s3_version', 'openshift_storage_glusterfs_s3_image'),
+    ('openshift_storage_glusterfs_heketi_version', 'openshift_storage_glusterfs_heketi_image'),
+    ('openshift_storage_glusterfs_registry_version', 'openshift_storage_glusterfs_registry_image'),
+    ('openshift_storage_glusterfs_registry_block_version', 'openshift_storage_glusterfs_registry_block_image'),
+    ('openshift_storage_glusterfs_registry_s3_version', 'openshift_storage_glusterfs_registry_s3_image'),
+    ('openshift_storage_glusterfs_registry_heketi_version', 'openshift_storage_glusterfs_registry_heketi_image'),
+)
+
+# TODO(michaelgugino): Remove in 3.11
+CHANGED_IMAGE_VARS = (
+    'openshift_storage_glusterfs_image',
+    'openshift_storage_glusterfs_block_image',
+    'openshift_storage_glusterfs_s3_image',
+    'openshift_storage_glusterfs_heketi_image',
+    'openshift_storage_glusterfs_registry_image',
+    'openshift_storage_glusterfs_registry_block_image',
+    'openshift_storage_glusterfs_registry_s3_image',
+    'openshift_storage_glusterfs_registry_heketi_image',
 )
 
 
@@ -265,6 +285,26 @@ class ActionModule(ActionBase):
                             'existing master configs, and remove the {} key'
                             'before proceeding.'.format(old_key, old_key))
 
+    def check_contains_version(self, hostvars, host):
+        """Fails if variable has old format not containing image version"""
+        found_incorrect = []
+        for img_var in CHANGED_IMAGE_VARS:
+            img_string = self.template_var(hostvars, host, img_var)
+            if not img_string:
+                return None
+            # split the image string by '/' to account for something like docker://
+            img_string_parts = img_string.split('/')
+            if ':' not in img_string_parts[-1]:
+                found_incorrect.append((img_var, img_string))
+
+        if found_incorrect:
+            msg = ("Found image variables without version.  Please ensure any image"
+                   "defined contains ':someversion'; ")
+            for item in found_incorrect:
+                msg += "{} was: {}; ".format(item[0], item[1])
+            raise errors.AnsibleModuleError(msg)
+        return None
+
     def run_checks(self, hostvars, host):
         """Execute the hostvars validations against host"""
         distro = self.template_var(hostvars, host, 'ansible_distribution')
@@ -277,6 +317,7 @@ class ActionModule(ActionBase):
         self.check_unsupported_nfs_configs(hostvars, host)
         self.check_htpasswd_provider(hostvars, host)
         check_for_removed_vars(hostvars, host)
+        self.check_contains_version(hostvars, host)
 
     def run(self, tmp=None, task_vars=None):
         result = super(ActionModule, self).run(tmp, task_vars)

roles/lib_utils/filter_plugins/oo_filters.py

@@ -706,8 +706,8 @@ def lib_utils_mutate_htpass_provider(idps):
     return idps
 
 
-def lib_utils_oo_etcd_image(osm_etcd_image_default, oreg_url):
-    '''Converts default etcd image string to utilize oreg_url, if defined.
+def lib_utils_oo_oreg_image(image_default, oreg_url):
+    '''Converts default image string to utilize oreg_url, if defined.
        oreg_url should be passed in as string "None" if undefined.
 
        Example input:  "quay.io/coreos/etcd:v99",
@@ -715,18 +715,18 @@ def lib_utils_oo_etcd_image(osm_etcd_image_default, oreg_url):
        Example output: "example.com/coreos/etcd:v99"'''
     # if no oreg_url is specified, we just return the original default
     if oreg_url == 'None':
-        return osm_etcd_image_default
+        return image_default
     oreg_parts = oreg_url.split('/')
     if len(oreg_parts) < 2:
         raise errors.AnsibleFilterError("oreg_url malformed: {}".format(oreg_url))
     if not (len(oreg_parts) >= 3 and '.' in oreg_parts[0]):
         # oreg_url does not include host information; we'll just return etcd default
-        return osm_etcd_image_default
+        return image_default
 
-    etcd_image_parts = osm_etcd_image_default.split('/')
-    if len(etcd_image_parts) < 3:
-        raise errors.AnsibleFilterError("etcd_image_dict malformed, do not adjust this value.")
-    return '/'.join([oreg_parts[0], etcd_image_parts[1], etcd_image_parts[2]])
+    image_parts = image_default.split('/')
+    if len(image_parts) < 3:
+        raise errors.AnsibleFilterError("default image dictionary malformed, do not adjust this value.")
+    return '/'.join([oreg_parts[0], image_parts[1], image_parts[2]])
 
 
 class FilterModule(object):
@@ -764,5 +764,5 @@ class FilterModule(object):
             "map_to_pairs": map_to_pairs,
             "lib_utils_oo_etcd_host_urls": lib_utils_oo_etcd_host_urls,
             "lib_utils_mutate_htpass_provider": lib_utils_mutate_htpass_provider,
-            "lib_utils_oo_etcd_image": lib_utils_oo_etcd_image,
+            "lib_utils_oo_oreg_image": lib_utils_oo_oreg_image,
         }

roles/openshift_storage_glusterfs/README.md

@@ -84,10 +84,8 @@ GlusterFS cluster into a new or existing OpenShift cluster:
 | openshift_storage_glusterfs_storageclass               | True                    | Automatically create a GlusterFS StorageClass for this group
 | openshift_storage_glusterfs_storageclass_default       | False                   | Sets the GlusterFS StorageClass for this group as cluster-wide default
 | openshift_storage_glusterfs_image                      | 'gluster/gluster-centos'| Container image to use for GlusterFS pods, enterprise default is 'rhgs3/rhgs-server-rhel7'
-| openshift_storage_glusterfs_version                    | 'latest'                | Container image version to use for GlusterFS pods
 | openshift_storage_glusterfs_block_deploy               | True                    | Deploy glusterblock provisioner service
 | openshift_storage_glusterfs_block_image                | 'gluster/glusterblock-provisioner'| Container image to use for glusterblock-provisioner pod, enterprise default is 'rhgs3/rhgs-gluster-block-prov-rhel7'
-| openshift_storage_glusterfs_block_version              | 'latest'                | Container image version to use for glusterblock-provisioner pod
 | openshift_storage_glusterfs_block_host_vol_create      | True                    | Automatically create GlusterFS volumes to host glusterblock volumes. **NOTE:** If this is False, block-hosting volumes will need to be manually created before glusterblock volumes can be provisioned
 | openshift_storage_glusterfs_block_host_vol_size        | 100                     | Size, in GB, of GlusterFS volumes that will be automatically create to host glusterblock volumes if not enough space is available for a glusterblock volume create request. **NOTE:** This value is effectively an upper limit on the size of glusterblock volumes unless you manually create larger GlusterFS block-hosting volumes
 | openshift_storage_glusterfs_block_host_vol_max         | 15                      | Max number of GlusterFS volumes to host glusterblock volumes
@@ -95,7 +93,6 @@ GlusterFS cluster into a new or existing OpenShift cluster:
 | openshift_storage_glusterfs_block_storageclass_default | False                   | Sets the glusterblock StorageClass for this group as cluster-wide default
 | openshift_storage_glusterfs_s3_deploy                  | True                    | Deploy gluster-s3 service
 | openshift_storage_glusterfs_s3_image                   | 'gluster/gluster-object'| Container image to use for gluster-s3 pod, enterprise default is 'rhgs3/rhgs-s3-server-rhel7'
-| openshift_storage_glusterfs_s3_version                 | 'latest'                | Container image version to use for gluster=s3 pod
 | openshift_storage_glusterfs_s3_account                 | Undefined               | S3 account name for the S3 service, required for S3 service deployment
 | openshift_storage_glusterfs_s3_user                    | Undefined               | S3 user name for the S3 service, required for S3 service deployment
 | openshift_storage_glusterfs_s3_password                | Undefined               | S3 user password for the S3 service, required for S3 service deployment
@@ -107,7 +104,6 @@ GlusterFS cluster into a new or existing OpenShift cluster:
 | openshift_storage_glusterfs_heketi_is_native           | True                    | heketi should be containerized
 | openshift_storage_glusterfs_heketi_cli                 | 'heketi-cli'            | Command/Path to invoke the heketi-cli tool **NOTE:** Change this only for **non-native heketi** if heketi-cli is not in the global `$PATH` of the machine running openshift-ansible
 | openshift_storage_glusterfs_heketi_image               | 'heketi/heketi'         | Container image to use for heketi pods, enterprise default is 'rhgs3/rhgs-volmanager-rhel7'
-| openshift_storage_glusterfs_heketi_version             | 'latest'                | Container image version to use for heketi pods
 | openshift_storage_glusterfs_heketi_admin_key           | auto-generated          | String to use as secret key for performing heketi commands as admin
 | openshift_storage_glusterfs_heketi_user_key            | auto-generated          | String to use as secret key for performing heketi commands as user that can only view or modify volumes
 | openshift_storage_glusterfs_heketi_topology_load       | True                    | Load the GlusterFS topology information into heketi

roles/openshift_storage_glusterfs/defaults/main.yml

@@ -1,4 +1,28 @@
 ---
+# lib_utils_oo_oreg_image is a custom filter defined in roles/lib_utils/filter_plugins/oo_filters.py
+# This filter attempts to combine oreg_url host with project/component from l_gluster*_image_dict.
+# "oreg.example.com/openshift3/ose-${component}:${version}"
+# becomes "oreg.example.com/rhgs3/rhgs-server-rhel7:latest"
+l_gluster_image_dict:
+  origin: "docker.io/gluster/gluster-centos:latest"
+  openshift-enterprise: "registry.access.redhat.com/rhgs3/rhgs-server-rhel7:latest"
+openshift_storage_glusterfs_image: "{{ l_gluster_image_dict[openshift_deployment_type] | lib_utils_oo_oreg_image((oreg_url | default('None'))) }}"
+
+l_gluster_block_image_dict:
+  origin: "docker.io/gluster/glusterblock-provisioner:latest"
+  openshift-enterprise: "registry.access.redhat.com/rhgs3/rhgs-gluster-block-prov-rhel7:latest"
+openshift_storage_glusterfs_block_image: "{{ l_gluster_block_image_dict[openshift_deployment_type] | lib_utils_oo_oreg_image((oreg_url | default('None'))) }}"
+
+l_gluster_s3_image_dict:
+  origin: "docker.io/gluster/gluster-object:latest"
+  openshift-enterprise: "registry.access.redhat.com/rhgs3/rhgs-s3-server-rhel7:latest"
+openshift_storage_glusterfs_s3_image: "{{ l_gluster_s3_image_dict[openshift_deployment_type] | lib_utils_oo_oreg_image((oreg_url | default('None'))) }}"
+
+l_gluster_heketi_image_dict:
+  origin: "docker.io/heketi/heketi:latest"
+  openshift-enterprise: "registry.access.redhat.com/rhgs3/rhgs-volmanager-rhel7:latest"
+openshift_storage_glusterfs_heketi_image: "{{ l_gluster_heketi_image_dict[openshift_deployment_type] | lib_utils_oo_oreg_image((oreg_url | default('None'))) }}"
+
 openshift_storage_glusterfs_timeout: 300
 openshift_storage_glusterfs_is_native: True
 openshift_storage_glusterfs_name: 'storage'
@@ -6,19 +30,13 @@ openshift_storage_glusterfs_nodeselector: "glusterfs={{ openshift_storage_gluste
 openshift_storage_glusterfs_use_default_selector: False
 openshift_storage_glusterfs_storageclass: True
 openshift_storage_glusterfs_storageclass_default: False
-openshift_storage_glusterfs_image: "{{ 'rhgs3/rhgs-server-rhel7' | quote if openshift_deployment_type == 'openshift-enterprise' else 'gluster/gluster-centos' | quote }}"
-openshift_storage_glusterfs_version: 'latest'
 openshift_storage_glusterfs_block_deploy: True
-openshift_storage_glusterfs_block_image: "{{ 'rhgs3/rhgs-gluster-block-prov-rhel7' | quote if openshift_deployment_type == 'openshift-enterprise' else 'gluster/glusterblock-provisioner' | quote }}"
-openshift_storage_glusterfs_block_version: 'latest'
 openshift_storage_glusterfs_block_host_vol_create: True
 openshift_storage_glusterfs_block_host_vol_size: 100
 openshift_storage_glusterfs_block_host_vol_max: 15
 openshift_storage_glusterfs_block_storageclass: False
 openshift_storage_glusterfs_block_storageclass_default: False
 openshift_storage_glusterfs_s3_deploy: True
-openshift_storage_glusterfs_s3_image: "{{ 'rhgs3/rhgs-s3-server-rhel7' | quote if openshift_deployment_type == 'openshift-enterprise' else 'gluster/gluster-object' | quote }}"
-openshift_storage_glusterfs_s3_version: 'latest'
 openshift_storage_glusterfs_s3_account: "{{ omit }}"
 openshift_storage_glusterfs_s3_user: "{{ omit }}"
 openshift_storage_glusterfs_s3_password: "{{ omit }}"
@@ -31,8 +49,6 @@ openshift_storage_glusterfs_heketi_is_native: "{{ openshift_storage_glusterfs_is
 openshift_storage_glusterfs_heketi_is_missing: True
 openshift_storage_glusterfs_heketi_deploy_is_missing: True
 openshift_storage_glusterfs_heketi_cli: 'heketi-cli'
-openshift_storage_glusterfs_heketi_image: "{{ 'rhgs3/rhgs-volmanager-rhel7' | quote if openshift_deployment_type == 'openshift-enterprise' else 'heketi/heketi' | quote }}"
-openshift_storage_glusterfs_heketi_version: 'latest'
 openshift_storage_glusterfs_heketi_admin_key: "{{ omit }}"
 openshift_storage_glusterfs_heketi_user_key: "{{ omit }}"
 openshift_storage_glusterfs_heketi_topology_load: True
@@ -56,10 +72,8 @@ openshift_storage_glusterfs_registry_use_default_selector: "{{ openshift_storage
 openshift_storage_glusterfs_registry_storageclass: False
 openshift_storage_glusterfs_registry_storageclass_default: False
 openshift_storage_glusterfs_registry_image: "{{ openshift_storage_glusterfs_image }}"
-openshift_storage_glusterfs_registry_version: "{{ openshift_storage_glusterfs_version }}"
 openshift_storage_glusterfs_registry_block_deploy: "{{ openshift_storage_glusterfs_block_deploy }}"
 openshift_storage_glusterfs_registry_block_image: "{{ openshift_storage_glusterfs_block_image }}"
-openshift_storage_glusterfs_registry_block_version: "{{ openshift_storage_glusterfs_block_version }}"
 openshift_storage_glusterfs_registry_block_host_vol_create: "{{ openshift_storage_glusterfs_block_host_vol_create }}"
 openshift_storage_glusterfs_registry_block_host_vol_size: "{{ openshift_storage_glusterfs_block_host_vol_size }}"
 openshift_storage_glusterfs_registry_block_host_vol_max: "{{ openshift_storage_glusterfs_block_host_vol_max }}"
@@ -67,7 +81,6 @@ openshift_storage_glusterfs_registry_block_storageclass: False
 openshift_storage_glusterfs_registry_block_storageclass_default: False
 openshift_storage_glusterfs_registry_s3_deploy: "{{ openshift_storage_glusterfs_s3_deploy }}"
 openshift_storage_glusterfs_registry_s3_image: "{{ openshift_storage_glusterfs_s3_image }}"
-openshift_storage_glusterfs_registry_s3_version: "{{ openshift_storage_glusterfs_s3_version }}"
 openshift_storage_glusterfs_registry_s3_account: "{{ openshift_storage_glusterfs_s3_account }}"
 openshift_storage_glusterfs_registry_s3_user: "{{ openshift_storage_glusterfs_s3_user }}"
 openshift_storage_glusterfs_registry_s3_password: "{{ openshift_storage_glusterfs_s3_password }}"
@@ -81,7 +94,6 @@ openshift_storage_glusterfs_registry_heketi_is_missing: "{{ openshift_storage_gl
 openshift_storage_glusterfs_registry_heketi_deploy_is_missing: "{{ openshift_storage_glusterfs_heketi_deploy_is_missing }}"
 openshift_storage_glusterfs_registry_heketi_cli: "{{ openshift_storage_glusterfs_heketi_cli }}"
 openshift_storage_glusterfs_registry_heketi_image: "{{ openshift_storage_glusterfs_heketi_image }}"
-openshift_storage_glusterfs_registry_heketi_version: "{{ openshift_storage_glusterfs_heketi_version }}"
 openshift_storage_glusterfs_registry_heketi_admin_key: "{{ omit }}"
 openshift_storage_glusterfs_registry_heketi_user_key: "{{ omit }}"
 openshift_storage_glusterfs_registry_heketi_topology_load: "{{ openshift_storage_glusterfs_heketi_topology_load }}"

roles/openshift_storage_glusterfs/files/deploy-heketi-template.yml

@@ -64,7 +64,7 @@ objects:
         serviceAccountName: heketi-${CLUSTER_NAME}-service-account
         containers:
         - name: heketi
-          image: ${IMAGE_NAME}:${IMAGE_VERSION}
+          image: ${IMAGE_NAME}
           imagePullPolicy: IfNotPresent
           env:
           - name: HEKETI_USER_KEY
@@ -127,9 +127,6 @@ parameters:
 - name: IMAGE_NAME
   displayName: heketi container image name
   required: True
-- name: IMAGE_VERSION
-  displayName: heketi container image version
-  required: True
 - name: CLUSTER_NAME
   displayName: GlusterFS cluster name
   description: A unique name to identify this heketi service, useful for running multiple heketi instances

roles/openshift_storage_glusterfs/files/gluster-s3-template.yml

@@ -62,7 +62,7 @@ objects:
       spec:
         containers:
         - name: gluster-s3
-          image: ${IMAGE_NAME}:${IMAGE_VERSION}
+          image: ${IMAGE_NAME}
           imagePullPolicy: IfNotPresent
           ports:
           - name: gluster
@@ -107,9 +107,6 @@ parameters:
 - name: IMAGE_NAME
   displayName: glusterblock provisioner container image name
   required: True
-- name: IMAGE_VERSION
-  displayName: glusterblock provisioner container image version
-  required: True
 - name: CLUSTER_NAME
   displayName: GlusterFS cluster name
   description: A unique name to identify which heketi service manages this cluster, useful for running multiple heketi instances

roles/openshift_storage_glusterfs/files/glusterblock-provisioner.yml

@@ -82,7 +82,7 @@ objects:
         serviceAccountName: glusterblock-${CLUSTER_NAME}-provisioner
         containers:
         - name: glusterblock-provisioner
-          image: ${IMAGE_NAME}:${IMAGE_VERSION}
+          image: ${IMAGE_NAME}
           imagePullPolicy: IfNotPresent
           env:
           - name: PROVISIONER_NAME
@@ -91,9 +91,6 @@ parameters:
 - name: IMAGE_NAME
   displayName: glusterblock provisioner container image name
   required: True
-- name: IMAGE_VERSION
-  displayName: glusterblock provisioner container image version
-  required: True
 - name: NAMESPACE
   displayName: glusterblock provisioner namespace
   description: The namespace in which these resources are being created

roles/openshift_storage_glusterfs/files/glusterfs-template.yml

@@ -33,7 +33,7 @@ objects:
         hostNetwork: true
         containers:
         - name: glusterfs
-          image: ${IMAGE_NAME}:${IMAGE_VERSION}
+          image: ${IMAGE_NAME}
           imagePullPolicy: IfNotPresent
           env:
           - name: GB_GLFS_LRU_COUNT
@@ -148,9 +148,6 @@ parameters:
 - name: IMAGE_NAME
   displayName: GlusterFS container image name
   required: True
-- name: IMAGE_VERSION
-  displayName: GlusterFS container image version
-  required: True
 - name: CLUSTER_NAME
   displayName: GlusterFS cluster name
   description: A unique name to identify which heketi service manages this cluster, useful for running multiple heketi instances

roles/openshift_storage_glusterfs/files/heketi-template.yml

@@ -63,7 +63,7 @@ objects:
         serviceAccountName: heketi-${CLUSTER_NAME}-service-account
         containers:
         - name: heketi
-          image: ${IMAGE_NAME}:${IMAGE_VERSION}
+          image: ${IMAGE_NAME}
           imagePullPolicy: IfNotPresent
           env:
           - name: HEKETI_USER_KEY
@@ -129,9 +129,6 @@ parameters:
 - name: IMAGE_NAME
   displayName: heketi container image name
   required: True
-- name: IMAGE_VERSION
-  displayName: heketi container image version
-  required: True
 - name: CLUSTER_NAME
   displayName: GlusterFS cluster name
   description: A unique name to identify this heketi service, useful for running multiple heketi instances

roles/openshift_storage_glusterfs/tasks/gluster_s3_deploy.yml

@@ -131,7 +131,6 @@
     create: True
     params:
       IMAGE_NAME: "{{ glusterfs_s3_image }}"
-      IMAGE_VERSION: "{{ glusterfs_s3_version }}"
       S3_ACCOUNT: "{{ glusterfs_s3_account }}"
       S3_USER: "{{ glusterfs_s3_user }}"
       S3_PASSWORD: "{{ glusterfs_s3_password }}"

roles/openshift_storage_glusterfs/tasks/glusterblock_deploy.yml

@@ -47,7 +47,6 @@
     create: True
     params:
       IMAGE_NAME: "{{ glusterfs_block_image }}"
-      IMAGE_VERSION: "{{ glusterfs_block_version }}"
       NAMESPACE: "{{ glusterfs_namespace }}"
       CLUSTER_NAME: "{{ glusterfs_name }}"
 

roles/openshift_storage_glusterfs/tasks/glusterfs_config_facts.yml

@@ -10,10 +10,8 @@
     glusterfs_storageclass: "{{ openshift_storage_glusterfs_storageclass }}"
     glusterfs_storageclass_default: "{{ openshift_storage_glusterfs_storageclass_default | bool }}"
     glusterfs_image: "{{ openshift_storage_glusterfs_image }}"
-    glusterfs_version: "{{ openshift_storage_glusterfs_version }}"
     glusterfs_block_deploy: "{{ openshift_storage_glusterfs_block_deploy | bool }}"
     glusterfs_block_image: "{{ openshift_storage_glusterfs_block_image }}"
-    glusterfs_block_version: "{{ openshift_storage_glusterfs_block_version }}"
     glusterfs_block_host_vol_create: "{{ openshift_storage_glusterfs_block_host_vol_create }}"
     glusterfs_block_host_vol_size: "{{ openshift_storage_glusterfs_block_host_vol_size }}"
     glusterfs_block_host_vol_max: "{{ openshift_storage_glusterfs_block_host_vol_max }}"
@@ -21,7 +19,6 @@
     glusterfs_block_storageclass_default: "{{ openshift_storage_glusterfs_block_storageclass_default | bool }}"
     glusterfs_s3_deploy: "{{ openshift_storage_glusterfs_s3_deploy | bool }}"
     glusterfs_s3_image: "{{ openshift_storage_glusterfs_s3_image }}"
-    glusterfs_s3_version: "{{ openshift_storage_glusterfs_s3_version }}"
     glusterfs_s3_account: "{{ openshift_storage_glusterfs_s3_account }}"
     glusterfs_s3_user: "{{ openshift_storage_glusterfs_s3_user }}"
     glusterfs_s3_password: "{{ openshift_storage_glusterfs_s3_password }}"
@@ -35,7 +32,6 @@
     glusterfs_heketi_deploy_is_missing: "{{ openshift_storage_glusterfs_heketi_deploy_is_missing | bool }}"
     glusterfs_heketi_cli: "{{ openshift_storage_glusterfs_heketi_cli }}"
     glusterfs_heketi_image: "{{ openshift_storage_glusterfs_heketi_image }}"
-    glusterfs_heketi_version: "{{ openshift_storage_glusterfs_heketi_version }}"
     glusterfs_heketi_admin_key: "{{ openshift_storage_glusterfs_heketi_admin_key }}"
     glusterfs_heketi_user_key: "{{ openshift_storage_glusterfs_heketi_user_key }}"
     glusterfs_heketi_topology_load: "{{ openshift_storage_glusterfs_heketi_topology_load | bool }}"

roles/openshift_storage_glusterfs/tasks/glusterfs_deploy.yml

@@ -92,7 +92,6 @@
     create: True
     params:
       IMAGE_NAME: "{{ glusterfs_image }}"
-      IMAGE_VERSION: "{{ glusterfs_version }}"
       NODE_LABELS: "{{ glusterfs_nodeselector }}"
       CLUSTER_NAME: "{{ glusterfs_name }}"
       GB_GLFS_LRU_COUNT: "{{ glusterfs_block_host_vol_max }}"

roles/openshift_storage_glusterfs/tasks/glusterfs_registry_facts.yml

@@ -10,10 +10,8 @@
     glusterfs_storageclass: "{{ openshift_storage_glusterfs_registry_storageclass }}"
     glusterfs_storageclass_default: "{{ openshift_storage_glusterfs_registry_storageclass_default | bool }}"
     glusterfs_image: "{{ openshift_storage_glusterfs_registry_image }}"
-    glusterfs_version: "{{ openshift_storage_glusterfs_registry_version }}"
     glusterfs_block_deploy: "{{ openshift_storage_glusterfs_registry_block_deploy | bool }}"
     glusterfs_block_image: "{{ openshift_storage_glusterfs_registry_block_image }}"
-    glusterfs_block_version: "{{ openshift_storage_glusterfs_registry_block_version }}"
     glusterfs_block_host_vol_create: "{{ openshift_storage_glusterfs_registry_block_host_vol_create }}"
     glusterfs_block_host_vol_size: "{{ openshift_storage_glusterfs_registry_block_host_vol_size }}"
     glusterfs_block_host_vol_max: "{{ openshift_storage_glusterfs_registry_block_host_vol_max }}"
@@ -21,7 +19,6 @@
     glusterfs_block_storageclass_default: "{{ openshift_storage_glusterfs_registry_block_storageclass_default | bool }}"
     glusterfs_s3_deploy: "{{ openshift_storage_glusterfs_registry_s3_deploy | bool }}"
     glusterfs_s3_image: "{{ openshift_storage_glusterfs_registry_s3_image }}"
-    glusterfs_s3_version: "{{ openshift_storage_glusterfs_registry_s3_version }}"
     glusterfs_s3_account: "{{ openshift_storage_glusterfs_registry_s3_account }}"
     glusterfs_s3_user: "{{ openshift_storage_glusterfs_registry_s3_user }}"
     glusterfs_s3_password: "{{ openshift_storage_glusterfs_registry_s3_password }}"
@@ -35,7 +32,6 @@
     glusterfs_heketi_deploy_is_missing: "{{ openshift_storage_glusterfs_registry_heketi_deploy_is_missing | bool }}"
     glusterfs_heketi_cli: "{{ openshift_storage_glusterfs_registry_heketi_cli }}"
     glusterfs_heketi_image: "{{ openshift_storage_glusterfs_registry_heketi_image }}"
-    glusterfs_heketi_version: "{{ openshift_storage_glusterfs_registry_heketi_version }}"
     glusterfs_heketi_admin_key: "{{ openshift_storage_glusterfs_registry_heketi_admin_key }}"
     glusterfs_heketi_user_key: "{{ openshift_storage_glusterfs_registry_heketi_user_key }}"
     glusterfs_heketi_topology_load: "{{ openshift_storage_glusterfs_registry_heketi_topology_load | bool }}"

roles/openshift_storage_glusterfs/tasks/heketi_deploy_part1.yml

@@ -22,7 +22,6 @@
     create: True
     params:
       IMAGE_NAME: "{{ glusterfs_heketi_image }}"
-      IMAGE_VERSION: "{{ glusterfs_heketi_version }}"
       HEKETI_ROUTE: "{{ glusterfs_heketi_url | default(['heketi-',glusterfs_name]|join) }}"
       HEKETI_USER_KEY: "{{ glusterfs_heketi_user_key }}"
       HEKETI_ADMIN_KEY: "{{ glusterfs_heketi_admin_key }}"

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 --image {{ glusterfs_heketi_image}}:{{ glusterfs_heketi_version }} --listfile /tmp/heketi-storage.json"
+  command: "{{ glusterfs_heketi_client }} setup-openshift-heketi-storage --image {{ glusterfs_heketi_image }} --listfile /tmp/heketi-storage.json"
   register: setup_storage
 
 - name: Copy heketi-storage list
@@ -95,7 +95,6 @@
     create: True
     params:
       IMAGE_NAME: "{{ glusterfs_heketi_image }}"
-      IMAGE_VERSION: "{{ glusterfs_heketi_version }}"
       HEKETI_ROUTE: "{{ glusterfs_heketi_url | default(['heketi-',glusterfs_name]|join) }}"
       HEKETI_USER_KEY: "{{ glusterfs_heketi_user_key }}"
       HEKETI_ADMIN_KEY: "{{ glusterfs_heketi_admin_key }}"