added pga_repo var changed the pga repo url to live in group_vars/all, since this may need to be changed on a per-gateway basis - I'd assume that individual gateway owners will change things like the appearance, etc.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/5f65b079 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/5f65b079 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/5f65b079 Branch: refs/heads/ansible-testing-0.17 Commit: 5f65b0796c32f014270fadc1c34cf5b5f474b600 Parents: d43efb5 Author: jecoulte <[email protected]> Authored: Wed Feb 8 13:44:49 2017 -0500 Committer: jecoulte <[email protected]> Committed: Wed Feb 8 13:44:49 2017 -0500 ---------------------------------------------------------------------- dev-tools/ansible/group_vars/all.yml | 2 ++ dev-tools/ansible/roles/pga/tasks/main.yml | 17 ++++++++++------- 2 files changed, 12 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/5f65b079/dev-tools/ansible/group_vars/all.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/group_vars/all.yml b/dev-tools/ansible/group_vars/all.yml index 46212ee..8a6e545 100644 --- a/dev-tools/ansible/group_vars/all.yml +++ b/dev-tools/ansible/group_vars/all.yml @@ -90,3 +90,5 @@ gfac_dir: "{{ deployment_dir }}/gfac-instance" monitor_email_address: "[email protected]" monitor_email_password: "airavata" +# PGA variables +pga_repo: "https://github.com/apache/airavata-php-gateway.git"; http://git-wip-us.apache.org/repos/asf/airavata/blob/5f65b079/dev-tools/ansible/roles/pga/tasks/main.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/roles/pga/tasks/main.yml b/dev-tools/ansible/roles/pga/tasks/main.yml index af150db..774a086 100644 --- a/dev-tools/ansible/roles/pga/tasks/main.yml +++ b/dev-tools/ansible/roles/pga/tasks/main.yml @@ -3,21 +3,24 @@ file: path="{{ doc_root_dir }}" state=directory become: yes -- debug: - var: ansible_distribution_version - - include: install_deps_{{ ansible_distribution }}_{{ ansible_distribution_major_version }}.yml # - name: Check previous deployments # stat: path="{{ doc_root_dir }}" get_md5=no get_checksum=no # register: check -- name: delete previous deployments - file: path="{{ doc_root_dir }}" state=absent +# Why? if it's new, we just created this dir above... +# if not, can just pull from the git repo in the next task... +#- name: delete previous deployments +# file: path="{{ doc_root_dir }}" state=absent - name: Git clone php gateway - git: repo=https://github.com/apache/airavata-php-gateway.git - dest="{{ doc_root_dir }}" version="{{ git_branch }}" + git: + repo: "{{ pga_repo }}" + dest: "{{ doc_root_dir }}" + version: "{{ git_branch }}" + update: yes + force: yes become: yes - name: Create user data dir {{ user_data_dir }}
