Repository: airavata Updated Branches: refs/heads/develop ad013e07a -> 0f03a85ae
Switching branch before merge to master Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0f03a85a Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0f03a85a Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0f03a85a Branch: refs/heads/develop Commit: 0f03a85aeb8dc7a9ae80673a12fe440eb0c65bb7 Parents: ad013e0 Author: Marcus Christie <machris...@apache.org> Authored: Thu Jul 27 16:52:22 2017 -0400 Committer: Marcus Christie <machris...@apache.org> Committed: Thu Aug 3 13:04:00 2017 -0400 ---------------------------------------------------------------------- .../inventories/scigap/PICKSC-Production/group_vars/pga/vars.yml | 2 +- .../ansible/inventories/scigap/production/group_vars/all/vars.yml | 2 +- .../inventories/scigap/production/pga_config/accord/vars.yml | 2 +- .../inventories/scigap/production/pga_config/brandeis/vars.yml | 2 +- .../inventories/scigap/production/pga_config/gatech/vars.yml | 2 +- .../inventories/scigap/production/pga_config/georgiastate/vars.yml | 2 +- .../inventories/scigap/production/pga_config/iugateway/vars.yml | 2 +- .../ansible/inventories/scigap/production/pga_config/lsu/vars.yml | 2 +- .../scigap/production/pga_config/nanoconfinement/vars.yml | 2 +- .../inventories/scigap/production/pga_config/nanoshape/vars.yml | 2 +- .../scigap/production/pga_config/newmexicostate/vars.yml | 2 +- .../ansible/inventories/scigap/production/pga_config/nsg/vars.yml | 2 +- .../inventories/scigap/production/pga_config/oiitandy/vars.yml | 2 +- .../inventories/scigap/production/pga_config/oscer/vars.yml | 2 +- .../inventories/scigap/production/pga_config/phasta/vars.yml | 2 +- .../inventories/scigap/production/pga_config/scigap/vars.yml | 2 +- .../inventories/scigap/production/pga_config/seagrid/vars.yml | 2 +- .../inventories/scigap/production/pga_config/simvascular/vars.yml | 2 +- .../inventories/scigap/production/pga_config/southdakota/vars.yml | 2 +- .../scigap/production/pga_config/southernillinois/vars.yml | 2 +- .../inventories/scigap/production/pga_config/testdrive/vars.yml | 2 +- .../ansible/inventories/scigap/production/pga_config/uab/vars.yml | 2 +- .../ansible/inventories/scigap/production/pga_config/utah/vars.yml | 2 +- 23 files changed, 23 insertions(+), 23 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/PICKSC-Production/group_vars/pga/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/PICKSC-Production/group_vars/pga/vars.yml b/dev-tools/ansible/inventories/scigap/PICKSC-Production/group_vars/pga/vars.yml index 14188e4..32e556e 100644 --- a/dev-tools/ansible/inventories/scigap/PICKSC-Production/group_vars/pga/vars.yml +++ b/dev-tools/ansible/inventories/scigap/PICKSC-Production/group_vars/pga/vars.yml @@ -29,7 +29,7 @@ airavata_port: "9930" # auth_verify_peer: "false" Needed for WSO2 IS pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/{{ gateway_id }}" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml index dc0155b..9d3b75e 100644 --- a/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/group_vars/all/vars.yml @@ -33,7 +33,7 @@ airavata_repo: "https://git-wip-us.apache.org/repos/asf/airavata.git" airavata_dist: "apache-airavata-server-0.17-SNAPSHOT" airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz" old_airavata_dist: "apache-airavata-server-0.17-SNAPSHOT" -git_branch: develop +git_branch: master # Database related variables db_server: "{{ groups['database'][0] }}" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml index cdae482..0544aaf 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/accord/vars.yml @@ -20,7 +20,7 @@ --- pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/accord" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml index 50663dc..1d2b909 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/brandeis/vars.yml @@ -20,7 +20,7 @@ --- pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/brandeis" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml index ef31523..ea6b399 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/gatech/vars.yml @@ -20,7 +20,7 @@ --- pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/georgia-tech" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml index 754c1f7..1917fe0 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/georgiastate/vars.yml @@ -20,7 +20,7 @@ --- pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/georgia-state" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml index 127bf76..c63e223 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/iugateway/vars.yml @@ -20,7 +20,7 @@ --- pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/iugateway" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml index ddc44e0..d7bd5fb 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/lsu/vars.yml @@ -20,7 +20,7 @@ --- pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/lsu" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml index 2755ce3..eadf2fa 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoconfinement/vars.yml @@ -20,7 +20,7 @@ --- pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/nanoconfinement" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml index 9bdc959..cf35720 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nanoshape/vars.yml @@ -20,7 +20,7 @@ --- pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/nanoshape" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml index adba265..70c0620 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/newmexicostate/vars.yml @@ -20,7 +20,7 @@ --- pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/new-mexico-state" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml index 297c1fc..b4d5d0d 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/nsg/vars.yml @@ -20,7 +20,7 @@ --- pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/nsg" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml index 577e5fb..8f1c80b 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/oiitandy/vars.yml @@ -20,7 +20,7 @@ --- pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/oii-tandy" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml index bae599e..01592c5 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/oscer/vars.yml @@ -20,7 +20,7 @@ --- pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/oscer" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml index 48a1cca..e38b845 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/phasta/vars.yml @@ -20,7 +20,7 @@ --- pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/phasta" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml index 987dccf..14309bf 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/scigap/vars.yml @@ -20,7 +20,7 @@ --- pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/scigap" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml index 19ec435..8df8061 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/seagrid/vars.yml @@ -20,7 +20,7 @@ --- pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/{{ gateway_id }}" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml index a15daa8..16fd82a 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/simvascular/vars.yml @@ -20,7 +20,7 @@ --- pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/simvascular" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml index 225843f..342f180 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southdakota/vars.yml @@ -20,7 +20,7 @@ --- pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/southdakota" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml index d2d9423..198313d 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/southernillinois/vars.yml @@ -20,7 +20,7 @@ --- pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/southernillinois" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml index de44cd7..56a2ce5 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/testdrive/vars.yml @@ -20,7 +20,7 @@ --- pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/testdrive" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml index 54cc932..4355173 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/uab/vars.yml @@ -20,7 +20,7 @@ --- pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/alabama-birmingham" http://git-wip-us.apache.org/repos/asf/airavata/blob/0f03a85a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml index a93f8c9..eb2bad8 100644 --- a/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml +++ b/dev-tools/ansible/inventories/scigap/production/pga_config/utah/vars.yml @@ -20,7 +20,7 @@ --- pga_repo: "https://github.com/apache/airavata-php-gateway.git" -git_branch: "develop" +git_branch: "master" user: "pga" group: "pga" doc_root_dir: "/var/www/portals/utah-university"