You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by la...@apache.org on 2016/10/01 23:46:56 UTC
[34/49] airavata git commit: Update properties
Update properties
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/72f35c19
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/72f35c19
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/72f35c19
Branch: refs/heads/lahiru/AIRAVATA-2107
Commit: 72f35c19c66b038dab4bc20f6365a80b857692cd
Parents: 2ab5a72
Author: Shameera Rathnayaka <sh...@gmail.com>
Authored: Mon Sep 19 14:35:24 2016 -0400
Committer: Shameera Rathnayaka <sh...@gmail.com>
Committed: Mon Sep 19 14:35:24 2016 -0400
----------------------------------------------------------------------
group_vars/all.yml | 5 +++--
.../templates/airavata-server.properties.j2 | 2 ++
.../gfac/templates/airavata-server.properties.j2 | 2 ++
roles/pga/tasks/main.yml | 7 +++++++
roles/pga/templates/pga_config.php.j2 | 18 ++++++++++++++----
roles/pga/vars/main.yml | 16 ++++++++--------
.../templates/airavata-server.properties.j2 | 2 ++
7 files changed, 38 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/72f35c19/group_vars/all.yml
----------------------------------------------------------------------
diff --git a/group_vars/all.yml b/group_vars/all.yml
index 7dfd8d4..d49f583 100644
--- a/group_vars/all.yml
+++ b/group_vars/all.yml
@@ -2,7 +2,7 @@
ansible_connection: ssh
# ansible_ssh_user: centos
ansible_ssh_user: root
-ansible_ssh_private_key_file: /Users/syodage/Projects/airavata-ansible/shameera-jetstream.pem
+ansible_ssh_private_key_file: /Users/syodage/Projects/airavata-ansible/dev-deployment-key.pem
# ansible_ssh_private_key_file: /Users/syodage/Projects/airavata-ansible/shameera-aws.pem.txt
user: centos
@@ -44,9 +44,10 @@ zookeeper_url: "{{ groups['zookeeper'][0] }}:{{ zookeeper_client_port }}"
api_server_name: "apiserver-node0"
api_server_host: "{{ansible_fqdn}}"
api_server_port: "8930"
-api_secured: "true"
+api_secured: "false"
tls_enable: "false"
api_server_tls_port: "9930"
+enable_sharing: false
# Orchestrator related variables
orchestrator_name: "orchestrator-node0"
http://git-wip-us.apache.org/repos/asf/airavata/blob/72f35c19/roles/api-orch/templates/airavata-server.properties.j2
----------------------------------------------------------------------
diff --git a/roles/api-orch/templates/airavata-server.properties.j2 b/roles/api-orch/templates/airavata-server.properties.j2
index 5a01525..e36b029 100644
--- a/roles/api-orch/templates/airavata-server.properties.j2
+++ b/roles/api-orch/templates/airavata-server.properties.j2
@@ -43,6 +43,7 @@ validationQuery=SELECT 1 from CONFIGURATION
cache.enable=false
jpa.cache.size=-1
#jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true
+enable.sharing={{enable_sharing}}
# Properties for default user mode
default.registry.user=admin
@@ -185,6 +186,7 @@ credential.store.jdbc.driver=com.mysql.jdbc.Driver
credential.store.server.host={{ cred_store_server_host }}
credential.store.server.port={{ cred_store_port }}
credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer
+credential.stroe.jdbc.validationQuery=SELECT 1 from CONFIGURATION
# these properties used by credential store email notifications
email.server=smtp.googlemail.com
http://git-wip-us.apache.org/repos/asf/airavata/blob/72f35c19/roles/gfac/templates/airavata-server.properties.j2
----------------------------------------------------------------------
diff --git a/roles/gfac/templates/airavata-server.properties.j2 b/roles/gfac/templates/airavata-server.properties.j2
index 5a01525..e36b029 100644
--- a/roles/gfac/templates/airavata-server.properties.j2
+++ b/roles/gfac/templates/airavata-server.properties.j2
@@ -43,6 +43,7 @@ validationQuery=SELECT 1 from CONFIGURATION
cache.enable=false
jpa.cache.size=-1
#jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true
+enable.sharing={{enable_sharing}}
# Properties for default user mode
default.registry.user=admin
@@ -185,6 +186,7 @@ credential.store.jdbc.driver=com.mysql.jdbc.Driver
credential.store.server.host={{ cred_store_server_host }}
credential.store.server.port={{ cred_store_port }}
credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer
+credential.stroe.jdbc.validationQuery=SELECT 1 from CONFIGURATION
# these properties used by credential store email notifications
email.server=smtp.googlemail.com
http://git-wip-us.apache.org/repos/asf/airavata/blob/72f35c19/roles/pga/tasks/main.yml
----------------------------------------------------------------------
diff --git a/roles/pga/tasks/main.yml b/roles/pga/tasks/main.yml
index 80beac2..6fe1df5 100644
--- a/roles/pga/tasks/main.yml
+++ b/roles/pga/tasks/main.yml
@@ -32,6 +32,13 @@
yum: name=php-mcrypt state=latest update_cache=yes
become: yes
+# - 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
+
- name: Git clone php gateway
git: repo=https://github.com/apache/airavata-php-gateway.git
dest="{{ doc_root_dir }}" version=master
http://git-wip-us.apache.org/repos/asf/airavata/blob/72f35c19/roles/pga/templates/pga_config.php.j2
----------------------------------------------------------------------
diff --git a/roles/pga/templates/pga_config.php.j2 b/roles/pga/templates/pga_config.php.j2
index 703f67f..7b38575 100644
--- a/roles/pga/templates/pga_config.php.j2
+++ b/roles/pga/templates/pga_config.php.j2
@@ -11,17 +11,17 @@ return array(
/**
* Admin Role Name
*/
- 'admin-role-name' => 'Internal/everyone',
+ 'admin-role-name' => 'admin',
/**
* Read only Admin Role Name
*/
- 'read-only-admin-role-name' => 'Internal/everyone',
+ 'read-only-admin-role-name' => 'admin-read-only',
/**
* Gateway user role
*/
- 'user-role-name' => 'Internal/everyone',
+ 'user-role-name' => 'gateway-user',
/**
* Tenant Domain
@@ -49,6 +49,11 @@ return array(
'oauth-client-secret' => '{{ oauth_client_secret }}',
/**
+ * OAuth Grant Type (password or authorization_code)
+ */
+ 'oauth-grant-type' => 'password',
+
+ /**
* Identity server domain
*/
'server' => 'idp.scigap.org',
@@ -151,7 +156,12 @@ return array(
/**
* Gateway data store resource id
*/
- 'gateway-data-store-resource-id' => '{{ gateway_data_store_resource_id }}'
+ 'gateway-data-store-resource-id' => '{{ gateway_data_store_resource_id }}',
+
+ /**
+ * Data Sharing enabled
+ */
+ 'data-sharing-enabled' => false
],
/**
http://git-wip-us.apache.org/repos/asf/airavata/blob/72f35c19/roles/pga/vars/main.yml
----------------------------------------------------------------------
diff --git a/roles/pga/vars/main.yml b/roles/pga/vars/main.yml
index b7ba81f..35c5122 100644
--- a/roles/pga/vars/main.yml
+++ b/roles/pga/vars/main.yml
@@ -7,15 +7,15 @@ user_data_dir: "/var/www/user_data"
httpd_conf_file_location: "/etc/httpd/conf"
## WSO2 IS related variables
-tenant_domain: "master2.airavata"
-admin_username: "master2"
-admin_password: "master"
-oauth_client_key: "5_GFR88Nzd4XvGthSMF1fnOJPuMa"
-oauth_client_secret: "KNTf_LPLuGBDbRVZwkrP_fF5z2Ea"
+tenant_domain: "prod.testdrive"
+admin_username: "tdaadmin"
+admin_password: "SciDeploy"
+oauth_client_key: "RuLl_Uw7i_KXaLoAGJkiasTfyBYa"
+oauth_client_secret: "vD9yi2ANkChzgWiih3RahrIcfsoa"
## Airavata Client related variables
#airavata_server: "tls://gw77.iu.xsede.org"
-airavata_server: "http://{{ groups['api-orch'][0] }}"
+airavata_server: "{{ groups['api-orch'][0] }}"
airavata_port: "8930"
gateway_id: "default"
# relative to document root dir
@@ -23,8 +23,8 @@ experiment_data_dir: "{{ user_data_dir }}"
gateway_data_store_resource_id: "gw75.iu.xsede.org_3e40e62b-be11-4590-bf24-b1b6796c3572"
## Portal related variables
-super_admin_portal: "false"
-admin_emails: "'sgg@iu.edu','blas@gmail.com'"
+super_admin_portal: "true"
+admin_emails: "'sgg@iu.edu'"
portal_email_username: "pga.airavata@gmail.com"
portal_email_password: "airavata12"
...
http://git-wip-us.apache.org/repos/asf/airavata/blob/72f35c19/roles/registry/templates/airavata-server.properties.j2
----------------------------------------------------------------------
diff --git a/roles/registry/templates/airavata-server.properties.j2 b/roles/registry/templates/airavata-server.properties.j2
index 5a01525..e36b029 100644
--- a/roles/registry/templates/airavata-server.properties.j2
+++ b/roles/registry/templates/airavata-server.properties.j2
@@ -43,6 +43,7 @@ validationQuery=SELECT 1 from CONFIGURATION
cache.enable=false
jpa.cache.size=-1
#jpa.connection.properties=MaxActive=10,MaxIdle=5,MinIdle=2,MaxWait=60000,testWhileIdle=true,testOnBorrow=true
+enable.sharing={{enable_sharing}}
# Properties for default user mode
default.registry.user=admin
@@ -185,6 +186,7 @@ credential.store.jdbc.driver=com.mysql.jdbc.Driver
credential.store.server.host={{ cred_store_server_host }}
credential.store.server.port={{ cred_store_port }}
credentialstore=org.apache.airavata.credential.store.server.CredentialStoreServer
+credential.stroe.jdbc.validationQuery=SELECT 1 from CONFIGURATION
# these properties used by credential store email notifications
email.server=smtp.googlemail.com