You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2017/05/30 19:02:55 UTC
[35/37] airavata git commit: AIRAVATA-2342 Add profile service port
to ansible pga_config.php
AIRAVATA-2342 Add profile service port to ansible pga_config.php
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/84c2fdc0
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/84c2fdc0
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/84c2fdc0
Branch: refs/heads/registry-refactoring
Commit: 84c2fdc01e9969c59f8ad1caafc0750698261543
Parents: df6cfd7
Author: Marcus Christie <ma...@apache.org>
Authored: Thu May 25 09:21:25 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu May 25 09:21:25 2017 -0400
----------------------------------------------------------------------
.../ansible/inventories/testing-0.17/group_vars/pga/vars.yml | 3 ++-
dev-tools/ansible/roles/pga/defaults/main.yml | 1 +
dev-tools/ansible/roles/pga/templates/pga_config.php.j2 | 5 +++++
3 files changed, 8 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/84c2fdc0/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml b/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml
index a9d8ede..6b52e30 100644
--- a/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml
+++ b/dev-tools/ansible/inventories/testing-0.17/group_vars/pga/vars.yml
@@ -40,7 +40,8 @@ oidc_discovery_url: "https://iam.scigap.org/auth/realms/prod.seagrid/.well-known
## Airavata Client related variables
#airavata_server: "tls://gw77.iu.xsede.org"
airavata_server: "{{ groups['api-orch'][0] }}"
-airavata_port: "8930"
+airavata_port: "{{ api_server_port }}"
+airavata_profile_service_port: "{{ profile_service_port }}"
gateway_id: "seagrid"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}"
http://git-wip-us.apache.org/repos/asf/airavata/blob/84c2fdc0/dev-tools/ansible/roles/pga/defaults/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/defaults/main.yml b/dev-tools/ansible/roles/pga/defaults/main.yml
index d7df57f..c106543 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -63,6 +63,7 @@ auth_verify_peer: "true"
#airavata_server: "tls://gw77.iu.xsede.org"
airavata_server: "{{ groups['api-orch'][0] }}"
airavata_port: "8930"
+airavata_profile_service_port: "8962"
gateway_id: "{{ default_gateway }}"
# relative to document root dir
experiment_data_dir: "{{ user_data_dir }}"
http://git-wip-us.apache.org/repos/asf/airavata/blob/84c2fdc0/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/templates/pga_config.php.j2 b/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
index 895c2cf..b3d0502 100644
--- a/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
+++ b/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
@@ -107,6 +107,11 @@ return array(
'airavata-port' => '{{ airavata_port }}',
/**
+ * Airavata Profile Service port
+ */
+ 'airavata-profile-service-port' => '{{ airavata_profile_service_port }}',
+
+ /**
* Airavata API server thrift communication timeout
*/
'airavata-timeout' => '1000000',