diff options
author | Jose A. Rivera <jarrpa@redhat.com> | 2017-04-17 17:36:19 -0500 |
---|---|---|
committer | Jose A. Rivera <jarrpa@redhat.com> | 2017-05-04 11:44:54 +0200 |
commit | 1328328522f11db02d526f72df66c424f3dfbfa3 (patch) | |
tree | 235aad87f12a43bd74d58260d31c482fde2997e4 /roles/openshift_storage_glusterfs/tasks/heketi_deploy_part1.yml | |
parent | 023e7d00b26b870b26c514a7893a9511fa9770d7 (diff) | |
download | openshift-1328328522f11db02d526f72df66c424f3dfbfa3.tar.gz openshift-1328328522f11db02d526f72df66c424f3dfbfa3.tar.bz2 openshift-1328328522f11db02d526f72df66c424f3dfbfa3.tar.xz openshift-1328328522f11db02d526f72df66c424f3dfbfa3.zip |
GlusterFS: Allow for a separate registry-specific playbook
Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
Diffstat (limited to 'roles/openshift_storage_glusterfs/tasks/heketi_deploy_part1.yml')
-rw-r--r-- | roles/openshift_storage_glusterfs/tasks/heketi_deploy_part1.yml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/roles/openshift_storage_glusterfs/tasks/heketi_deploy_part1.yml b/roles/openshift_storage_glusterfs/tasks/heketi_deploy_part1.yml index 76ae1db75..c14fcfb15 100644 --- a/roles/openshift_storage_glusterfs/tasks/heketi_deploy_part1.yml +++ b/roles/openshift_storage_glusterfs/tasks/heketi_deploy_part1.yml @@ -8,7 +8,7 @@ - name: Create deploy-heketi resources oc_obj: - namespace: "{{ openshift_storage_glusterfs_namespace }}" + namespace: "{{ glusterfs_namespace }}" kind: template name: deploy-heketi state: present @@ -17,18 +17,18 @@ - name: Deploy deploy-heketi pod oc_process: - namespace: "{{ openshift_storage_glusterfs_namespace }}" + namespace: "{{ glusterfs_namespace }}" template_name: "deploy-heketi" create: True params: - IMAGE_NAME: "{{ openshift_storage_glusterfs_heketi_image }}" - IMAGE_VERSION: "{{ openshift_storage_glusterfs_heketi_version }}" - HEKETI_USER_KEY: "{{ openshift_storage_glusterfs_heketi_user_key }}" - HEKETI_ADMIN_KEY: "{{ openshift_storage_glusterfs_heketi_admin_key }}" + IMAGE_NAME: "{{ glusterfs_heketi_image }}" + IMAGE_VERSION: "{{ glusterfs_heketi_version }}" + HEKETI_USER_KEY: "{{ glusterfs_heketi_user_key }}" + HEKETI_ADMIN_KEY: "{{ glusterfs_heketi_admin_key }}" - name: Wait for deploy-heketi pod oc_obj: - namespace: "{{ openshift_storage_glusterfs_namespace }}" + namespace: "{{ glusterfs_namespace }}" kind: pod state: list selector: "glusterfs=deploy-heketi-pod,deploy-heketi=support" @@ -38,4 +38,4 @@ # Pod's 'Ready' status must be True - "heketi_pod.results.results[0]['items'] | oo_collect(attribute='status.conditions') | oo_collect(attribute='status', filters={'type': 'Ready'}) | map('bool') | select | list | count == 1" delay: 10 - retries: "{{ (openshift_storage_glusterfs_timeout / 10) | int }}" + retries: "{{ (glusterfs_timeout / 10) | int }}" |