diff options
Diffstat (limited to 'roles/openshift_cfme/tasks/main.yml')
-rw-r--r-- | roles/openshift_cfme/tasks/main.yml | 51 |
1 files changed, 10 insertions, 41 deletions
diff --git a/roles/openshift_cfme/tasks/main.yml b/roles/openshift_cfme/tasks/main.yml index acbce7232..74ae16d91 100644 --- a/roles/openshift_cfme/tasks/main.yml +++ b/roles/openshift_cfme/tasks/main.yml @@ -24,48 +24,10 @@ ###################################################################### # NFS +# In the case that we are not running on a cloud provider, volumes must be statically provisioned -- name: Ensure the /exports/ directory exists - file: - path: /exports/ - state: directory - mode: 0755 - owner: root - group: root - -- name: Ensure the miq-pv0X export directories exist - file: - path: "/exports/{{ item }}" - state: directory - mode: 0775 - owner: root - group: root - with_items: "{{ openshift_cfme_pv_exports }}" - -- name: Ensure the NFS exports for CFME PVs exist - copy: - src: openshift_cfme.exports - dest: /etc/exports.d/openshift_cfme.exports - register: nfs_exports_updated - -- name: Ensure the NFS export table is refreshed if exports were added - command: exportfs -ar - when: - - nfs_exports_updated.changed - - -###################################################################### -# Create the required CFME PVs. Check out these online docs if you -# need a refresher on includes looping with items: -# * http://docs.ansible.com/ansible/playbooks_loops.html#loops-and-includes-in-2-0 -# * http://stackoverflow.com/a/35128533 -# -# TODO: Handle the case where a PV template is updated in -# openshift-ansible and the change needs to be landed on the managed -# cluster. - -- include: create_pvs.yml - with_items: "{{ openshift_cfme_pv_data }}" +- include: nfs.yml + when: not (openshift_cloudprovider_kind is defined and (openshift_cloudprovider_kind == 'aws' or openshift_cloudprovider_kind == 'gce')) ###################################################################### # CFME App Template @@ -110,6 +72,13 @@ namespace: "{{ openshift_cfme_project }}" template_name: manageiq create: True + params: + APPLICATION_IMG_NAME: "{{ openshift_cfme_application_img_name }}" + POSTGRESQL_IMG_NAME: "{{ openshift_cfme_postgresql_img_name }}" + MEMCACHED_IMG_NAME: "{{ openshift_cfme_memcached_img_name }}" + APPLICATION_IMG_TAG: "{{ openshift_cfme_application_img_tag }}" + POSTGRESQL_IMG_TAG: "{{ openshift_cfme_postgresql_img_tag }}" + MEMCACHED_IMG_TAG: "{{ openshift_cfme_memcached_img_tag }}" register: cfme_new_app_process run_once: True when: |