Merge branch 'AIRAVATA-2376' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/93fa1f71 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/93fa1f71 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/93fa1f71 Branch: refs/heads/develop Commit: 93fa1f71da9a2438768c7db7f75a934a52577274 Parents: 1279779 047521f Author: Marcus Christie <[email protected]> Authored: Thu Jun 15 12:19:42 2017 -0400 Committer: Marcus Christie <[email protected]> Committed: Thu Jun 15 12:19:42 2017 -0400 ---------------------------------------------------------------------- .../ansible/roles/api-orch/defaults/main.yml | 2 ++ .../files/mysql-connector-java-5.1.37-bin.jar | Bin 985603 -> 0 bytes dev-tools/ansible/roles/api-orch/tasks/main.yml | 10 +++--- .../templates/airavata-server.properties.j2 | 34 +++++++++---------- dev-tools/ansible/roles/gfac/defaults/main.yml | 1 + .../files/mysql-connector-java-5.1.37-bin.jar | Bin 985603 -> 0 bytes dev-tools/ansible/roles/gfac/tasks/main.yml | 11 +++--- .../templates/airavata-server.properties.j2 | 34 +++++++++---------- .../files/mysql-connector-java-5.1.37-bin.jar | Bin 985603 -> 0 bytes .../main/resources/airavata-server.properties | 34 +++++++++---------- .../src/main/resources/expcatalog-mysql.sql | 2 +- .../DeltaScripts/expCatalog_schema_delta.sql | 2 +- 12 files changed, 66 insertions(+), 64 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/93fa1f71/dev-tools/ansible/roles/api-orch/defaults/main.yml ---------------------------------------------------------------------- diff --cc dev-tools/ansible/roles/api-orch/defaults/main.yml index f14ab0e,7cb73fc..37235dc --- a/dev-tools/ansible/roles/api-orch/defaults/main.yml +++ b/dev-tools/ansible/roles/api-orch/defaults/main.yml @@@ -19,9 -19,5 +19,11 @@@ # api_orch_server_names: "api-orch" -api_orch_log_dir: "../logs" +api_orch_log_dir: "{{ api_orch_dir }}/{{ airavata_dist }}/logs" + +remote_idp_service_url: "https://iam.scigap.org/auth"; + +profile_service_host: "localhost" +profile_service_port: 8962 ++ + mariadb_connector_jar_url: "https://downloads.mariadb.com/Connectors/java/connector-java-2.0.2/mariadb-java-client-2.0.2.jar"; http://git-wip-us.apache.org/repos/asf/airavata/blob/93fa1f71/dev-tools/ansible/roles/api-orch/templates/airavata-server.properties.j2 ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/93fa1f71/dev-tools/ansible/roles/gfac/defaults/main.yml ---------------------------------------------------------------------- diff --cc dev-tools/ansible/roles/gfac/defaults/main.yml index 3ce8289,fff346c..022cfcd --- a/dev-tools/ansible/roles/gfac/defaults/main.yml +++ b/dev-tools/ansible/roles/gfac/defaults/main.yml @@@ -18,4 -18,5 +18,5 @@@ # under the License. # -gfac_log_dir: "../logs" +gfac_log_dir: "{{ gfac_dir }}/{{ airavata_dist }}/logs" + mariadb_connector_jar_url: "https://downloads.mariadb.com/Connectors/java/connector-java-2.0.2/mariadb-java-client-2.0.2.jar"; http://git-wip-us.apache.org/repos/asf/airavata/blob/93fa1f71/dev-tools/ansible/roles/gfac/templates/airavata-server.properties.j2 ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/93fa1f71/modules/configuration/server/src/main/resources/airavata-server.properties ----------------------------------------------------------------------
