You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/05/09 16:32:27 UTC
[1/7] airavata git commit: Fixed bug with copying default.conf
virtual host
Repository: airavata
Updated Branches:
refs/heads/develop b1ed4caac -> 44f9493e6
Fixed bug with copying default.conf virtual host
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/b6fb0b98
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/b6fb0b98
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/b6fb0b98
Branch: refs/heads/develop
Commit: b6fb0b98d146951df5caa975b6d641a0b90fa7ef
Parents: 10d7c02
Author: Marcus Christie <ma...@apache.org>
Authored: Fri Apr 28 11:35:45 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Fri Apr 28 11:35:45 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/roles/pga/defaults/main.yml | 3 +++
dev-tools/ansible/roles/pga/tasks/main.yml | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/b6fb0b98/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 a36593c..a7e7934 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -26,6 +26,9 @@ vhost_ssl: False
httpd_confd_file_location:
RedHat: "/etc/httpd/conf.d/pga-{{ gateway_id }}.conf"
Debian: "/etc/apache2/sites-available/pga-{{ gateway_id }}.conf"
+default_conf_file_location:
+ RedHat: "/etc/httpd/conf.d/default.conf"
+ Debian: "/etc/apache2/sites-available/default.conf"
httpd_name:
Debian: apache2
RedHat: httpd
http://git-wip-us.apache.org/repos/asf/airavata/blob/b6fb0b98/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 9e9cb74..36ad77c 100644
--- a/dev-tools/ansible/roles/pga/tasks/main.yml
+++ b/dev-tools/ansible/roles/pga/tasks/main.yml
@@ -141,7 +141,7 @@
when: vhost_ssl
- name: copy default virtual host file
- copy: src=default.conf dest={{ httpd_confd_file_location[ansible_os_family] }} backup=yes
+ copy: src=default.conf dest={{ default_conf_file_location[ansible_os_family] }} backup=yes
become: yes
notify:
- restart httpd
[7/7] airavata git commit: Merge branch 'lsf-walltime' into develop
Posted by ma...@apache.org.
Merge branch 'lsf-walltime' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/44f9493e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/44f9493e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/44f9493e
Branch: refs/heads/develop
Commit: 44f9493e696b85033f1b4455be1d699e97e7abfc
Parents: b1ed4ca 31a6705
Author: Marcus Christie <ma...@apache.org>
Authored: Tue May 9 12:29:57 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue May 9 12:30:52 2017 -0400
----------------------------------------------------------------------
.../dreg-production/files/pga-ssl-vhost.conf.j2 | 31 +++++++++
.../dreg-production/group_vars/pga/vars.yml | 67 ++++++++++++++++++++
.../dreg-production/group_vars/pga/vault.yml | 18 ++++++
.../inventories/scigap/dreg-production/hosts | 21 ++++++
.../scigap/production/group_vars/all/vars.yml | 5 +-
dev-tools/ansible/pga-scigap-prod.yml | 2 +-
.../roles/gfac/templates/gfac-config.yaml.j2 | 1 +
dev-tools/ansible/roles/pga/defaults/main.yml | 3 +
.../roles/pga/tasks/install_deps_CentOS_7.yml | 1 +
dev-tools/ansible/roles/pga/tasks/main.yml | 3 +-
.../roles/pga/templates/pga_config.php.j2 | 2 +-
.../apache/airavata/gfac/core/GFacUtils.java | 2 +-
12 files changed, 151 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/44f9493e/dev-tools/ansible/roles/pga/defaults/main.yml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/44f9493e/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
----------------------------------------------------------------------
[5/7] airavata git commit: Moving dREG gateway to Jetstream;
fixed selinux file contexts
Posted by ma...@apache.org.
Moving dREG gateway to Jetstream; fixed selinux file contexts
SELinux file contexts don't work with symlinks so I added a
real_user_data_dir ansible variable to deal with that situation.
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/45e8f654
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/45e8f654
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/45e8f654
Branch: refs/heads/develop
Commit: 45e8f654a4bab789e272dda86d62f1969c11e227
Parents: 24f8b7f
Author: Marcus Christie <ma...@iu.edu>
Authored: Tue May 2 09:39:21 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Tue May 2 09:39:21 2017 -0400
----------------------------------------------------------------------
.../dreg-production/files/pga-ssl-vhost.conf.j2 | 31 +++++++++
.../dreg-production/group_vars/pga/vars.yml | 67 ++++++++++++++++++++
.../dreg-production/group_vars/pga/vault.yml | 18 ++++++
.../inventories/scigap/dreg-production/hosts | 21 ++++++
.../scigap/production/group_vars/all/vars.yml | 1 +
dev-tools/ansible/roles/pga/defaults/main.yml | 2 +
.../roles/pga/tasks/install_deps_CentOS_7.yml | 1 +
dev-tools/ansible/roles/pga/tasks/main.yml | 3 +-
8 files changed, 143 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/45e8f654/dev-tools/ansible/inventories/scigap/dreg-production/files/pga-ssl-vhost.conf.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/dreg-production/files/pga-ssl-vhost.conf.j2 b/dev-tools/ansible/inventories/scigap/dreg-production/files/pga-ssl-vhost.conf.j2
new file mode 100644
index 0000000..ee053cc
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/dreg-production/files/pga-ssl-vhost.conf.j2
@@ -0,0 +1,31 @@
+<VirtualHost *:80>
+ ServerName {{ vhost_servername }}
+ {% if vhost_serveralias is defined %}
+ ServerAlias {{ vhost_serveralias }}
+ {% endif %}
+
+ ## Redirect all http traffic to https
+ RewriteEngine On
+ RewriteCond %{HTTPS} off
+ # Don't redirect /gbrowser and /gbfile requests to HTTPS
+ RewriteCond %{THE_REQUEST} !\s/(gbrowser|gbfile)
+ RewriteRule (.*) https://%{HTTP_HOST}%{REQUEST_URI}
+</VirtualHost>
+
+<VirtualHost *:443>
+ ServerName {{ vhost_servername }}
+ {% if vhost_serveralias is defined %}
+ ServerAlias {{ vhost_serveralias }}
+ {% endif %}
+
+ DocumentRoot {{ doc_root_dir }}/public
+ <Directory "{{ doc_root_dir }}/public">
+ AllowOverride All
+ </Directory>
+ ErrorLog {{ httpd_log_dir[ansible_os_family] }}/{{ gateway_id }}.error.log
+ CustomLog {{ httpd_log_dir[ansible_os_family] }}/{{ gateway_id }}.requests.log combined
+ SSLEngine on
+ SSLCertificateFile {{ ssl_certificate_file }}
+ SSLCertificateChainFile {{ ssl_certificate_chain_file }}
+ SSLCertificateKeyFile {{ ssl_certificate_key_file }}
+</VirtualHost>
http://git-wip-us.apache.org/repos/asf/airavata/blob/45e8f654/dev-tools/ansible/inventories/scigap/dreg-production/group_vars/pga/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/dreg-production/group_vars/pga/vars.yml b/dev-tools/ansible/inventories/scigap/dreg-production/group_vars/pga/vars.yml
new file mode 100644
index 0000000..4f15b2b
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/dreg-production/group_vars/pga/vars.yml
@@ -0,0 +1,67 @@
+#
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements. See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership. The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+
+---
+
+user_data_dir: "/var/www/portals/gateway-user-data"
+real_user_data_dir: "/data/gateway-user-data"
+## Airavata Client related variables
+airavata_server: "tls://{{ groups['api-orch'][0] }}"
+airavata_port: "9930"
+# FIXME: temporarily turn off SSL verification for WSO2 IS
+auth_verify_peer: "false"
+
+pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+git_branch: "dreg-gateway"
+user: "pga"
+group: "pga"
+doc_root_dir: "/var/www/portals/{{ gateway_id }}"
+vhost_servername: "dreg.dnasequence.org"
+vhost_ssl: True
+# TODO: have Ansible manage these files as well
+ssl_certificate_file: "/etc/letsencrypt/live/dreg.dnasequence.org/cert.pem"
+ssl_certificate_chain_file: "/etc/letsencrypt/live/dreg.dnasequence.org/fullchain.pem"
+ssl_certificate_key_file: "/etc/letsencrypt/live/dreg.dnasequence.org/privkey.pem"
+pga_ssl_vhost_template: "{{ inventory_dir }}/files/pga-ssl-vhost.conf.j2"
+
+## WSO2 IS related variables
+tenant_domain: "dreg.cornell"
+admin_username: "admin"
+admin_password: "{{ vault_admin_password }}"
+oauth_client_key: "{{ vault_oauth_client_key }}"
+oauth_client_secret: "{{ vault_oauth_client_secret }}"
+# dREG gateway automatically gives users the gateway-user role so they don't have to wait on admin approval
+initial_role_name: "gateway-user"
+
+gateway_id: "cornelldna"
+# relative to document root dir
+experiment_data_dir: "{{ user_data_dir }}/cornell-dnasequence"
+gateway_data_store_resource_id: "gf4.ucs.indiana.edu_61552681-96f0-462a-a36c-a62a010bffc6"
+gateway_data_store_ssh_public_key: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCTs6k2lSt5nn+UF3N1rAko9WjdtHZ1xLcKxCG4+4AVMdTIeng12g+1qB5hIFiDgesT/D/nzoA27EFj5nWiYanxBySNgl1Re8kR0nEqQbR0zj1dSibmfjW+vmOZzEiNSrNoLlc4KbFgqFCRGIlZ1bWZ7yHtJ3I7xxfKhvvxCTzJ4K71v1aovnDTUYophy2lUsdOcOq84Qhv3ITZafgblz3mJSwVpnnI72IepzonzDUdcf/w0lKCl70L9MgQAZ2V4e9sQZWJLI5s1VtJsqKggtgI4goPyxXROoH9PTUZFqvvYjLGW8JVS9eZKblSKil09yckPfZCSk1i/UD/uY6O7bjf"
+
+## Portal related variables
+super_admin_portal: "false"
+admin_emails: "['zw355@cornell.edu','sgg@iu.edu']"
+portal_email_username: "pga.airavata@gmail.com"
+portal_email_password: "{{ vault_portal_email_password }}"
+# The portal theme is included in the dreg-gateway branch of airavata-php-gateway
+portal_theme: "dreg"
+portal_title: "dREG DNA Sequencing"
+...
http://git-wip-us.apache.org/repos/asf/airavata/blob/45e8f654/dev-tools/ansible/inventories/scigap/dreg-production/group_vars/pga/vault.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/dreg-production/group_vars/pga/vault.yml b/dev-tools/ansible/inventories/scigap/dreg-production/group_vars/pga/vault.yml
new file mode 100644
index 0000000..eaca63b
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/dreg-production/group_vars/pga/vault.yml
@@ -0,0 +1,18 @@
+$ANSIBLE_VAULT;1.1;AES256
+37653231363231666433316261313238643763633234663866393832386236643436623566303263
+3334323065363831656435383564623034393661323037300a343263316666633131366134613661
+39633030386362623966303630653462373762373034323134356539313036376563613335383135
+3962646533323362370a383064616634303730373232353663386165313666303732396635643562
+39313037323264656236323337643862636265626138656435303064353531616264633435643965
+38616138613039336666313436643635666337643533343264326637653864356563343532333262
+35323335336437333964373366653737343032306238643032343162353437666664376636353236
+32363138633432396330613832656266663734616131383735393565343133626666313766313164
+35386534313033623563613635343163633564613636636236316633623263313437626337663530
+64313166323263353266623135616236653463356439363530373630653232363863303238356265
+65363630393364636238643861386161356635666331336530626533666434373931393237643861
+33383663653439313064393735653064323836656666343366636161643938396136383234386232
+33343238636238373936663365316663653532616364636336363936316235353164636365613738
+33346462386230623735376132306663633932363838643935373539316565626435646565393833
+66623065373162623964363665646436356464643366633764323232343736353032616561643637
+30326166396262316335323463323763653930653263613162663336343863313937393934313765
+30626235653162643566366361303630616437346539333436616666313738346232
http://git-wip-us.apache.org/repos/asf/airavata/blob/45e8f654/dev-tools/ansible/inventories/scigap/dreg-production/hosts
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/dreg-production/hosts b/dev-tools/ansible/inventories/scigap/dreg-production/hosts
new file mode 100644
index 0000000..bbfc7c9
--- /dev/null
+++ b/dev-tools/ansible/inventories/scigap/dreg-production/hosts
@@ -0,0 +1,21 @@
+---
+# inventory file : scigap production deployment
+
+[zookeeper]
+gf5.ucs.indiana.edu
+
+[rabbitmq]
+gf5.ucs.indiana.edu
+
+[database]
+gf3.ucs.indiana.edu
+
+[api-orch]
+gf5.ucs.indiana.edu
+
+[gfac]
+gf6.ucs.indiana.edu
+
+[pga]
+# Hosted on Jetstream
+149.165.156.72 ansible_user=centos
http://git-wip-us.apache.org/repos/asf/airavata/blob/45e8f654/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 756edea..2313795 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
@@ -113,6 +113,7 @@ monitor_email_password: "{{ vault_monitor_email_password }}"
# PGA variables
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
user_data_dir: "/var/www/portals/gateway-user-data"
+real_user_data_dir: "/data/gateway-user-data"
## Airavata Client related variables
#airavata_server: "tls://gw77.iu.xsede.org"
airavata_server: "tls://{{ groups['api-orch'][0] }}"
http://git-wip-us.apache.org/repos/asf/airavata/blob/45e8f654/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 e8f869b..f5fbad9 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -21,6 +21,8 @@
---
doc_root_dir: "/var/www/{{ gateway_id }}"
user_data_dir: "/var/www/user_data"
+# real_user_data_dir is the same as user_data_dir but without symbolic links in it
+real_user_data_dir: "{{ user_data_dir }}"
vhost_servername: "{{ groups['pga'][0] }}"
vhost_ssl: False
httpd_confd_file_location:
http://git-wip-us.apache.org/repos/asf/airavata/blob/45e8f654/dev-tools/ansible/roles/pga/tasks/install_deps_CentOS_7.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/tasks/install_deps_CentOS_7.yml b/dev-tools/ansible/roles/pga/tasks/install_deps_CentOS_7.yml
index 649d333..2c5dc9f 100644
--- a/dev-tools/ansible/roles/pga/tasks/install_deps_CentOS_7.yml
+++ b/dev-tools/ansible/roles/pga/tasks/install_deps_CentOS_7.yml
@@ -25,6 +25,7 @@
with_items:
- git
- httpd
+ - mod_ssl
- php
- php-soap
- libselinux-python
http://git-wip-us.apache.org/repos/asf/airavata/blob/45e8f654/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 36ad77c..0ea5d63 100644
--- a/dev-tools/ansible/roles/pga/tasks/main.yml
+++ b/dev-tools/ansible/roles/pga/tasks/main.yml
@@ -67,7 +67,8 @@
- name: set selinux context to allow read/write on the user data directory
sefcontext:
- target: "{{ user_data_dir }}(/.*)?"
+ # For SELinux file contexts, the real path without symbolic links must be used
+ target: "{{ real_user_data_dir }}(/.*)?"
setype: httpd_sys_rw_content_t
state: present
become: yes
[6/7] airavata git commit: Fix walltime calculation for LSF
Posted by ma...@apache.org.
Fix walltime calculation for LSF
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/31a67053
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/31a67053
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/31a67053
Branch: refs/heads/develop
Commit: 31a67053d4f83fc9ff10e3d64c12f6da63ffd1aa
Parents: 45e8f65
Author: Marcus Christie <ma...@apache.org>
Authored: Tue May 9 12:29:28 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Tue May 9 12:29:28 2017 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/airavata/gfac/core/GFacUtils.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/31a67053/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
----------------------------------------------------------------------
diff --git a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
index 22190c9..19a94d6 100644
--- a/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
+++ b/modules/gfac/gfac-core/src/main/java/org/apache/airavata/gfac/core/GFacUtils.java
@@ -558,7 +558,7 @@ public class GFacUtils {
if (resourceJobManager != null) {
if (resourceJobManager.getResourceJobManagerType().equals(ResourceJobManagerType.LSF)) {
groovyMap.add(Script.MAX_WALL_TIME,
- GFacUtils.maxWallTimeCalculator(scheduling.getWallTimeLimit()));
+ GFacUtils.maxWallTimeCalculatorForLSF(scheduling.getWallTimeLimit()));
}
}
}
[2/7] airavata git commit: Adding SLURM email address for
jetstream.chemcompute.org
Posted by ma...@apache.org.
Adding SLURM email address for jetstream.chemcompute.org
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/beb3b43e
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/beb3b43e
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/beb3b43e
Branch: refs/heads/develop
Commit: beb3b43e1d33794e0d62c61ae9259505cf4a2733
Parents: b6fb0b9
Author: Marcus Christie <ma...@iu.edu>
Authored: Sat Apr 29 19:10:26 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Sat Apr 29 19:10:26 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2 | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/beb3b43e/dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2 b/dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2
index b6dbdc2..8ec78c8 100644
--- a/dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2
+++ b/dev-tools/ansible/roles/gfac/templates/gfac-config.yaml.j2
@@ -97,6 +97,7 @@ resources:
- Slurm Daemon <sl...@odin.oscer.ou.edu> # OU Schooner
- slurm@lnet28.stampede.tacc.utexas.edu # stampede2
- Slurm service account <sl...@chpc.utah.edu> # Utah Ember
+ - SLURM workload manager <sl...@jetstream.chemcompute.org> # JS Mark Cluster
- jobManagerType: UGE
commandOutputParser: org.apache.airavata.gfac.impl.job.UGEOutputParser
[4/7] airavata git commit: Temporarily disable WSO2 IS SSL
verification and API security
Posted by ma...@apache.org.
Temporarily disable WSO2 IS SSL verification and API security
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/24f8b7f0
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/24f8b7f0
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/24f8b7f0
Branch: refs/heads/develop
Commit: 24f8b7f0f23a098babac6b1017c8b9bce67f71f2
Parents: a97bb13
Author: Marcus Christie <ma...@iu.edu>
Authored: Mon May 1 14:08:55 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Tue May 2 09:24:26 2017 -0400
----------------------------------------------------------------------
.../inventories/scigap/production/group_vars/all/vars.yml | 4 +++-
dev-tools/ansible/roles/pga/defaults/main.yml | 1 +
dev-tools/ansible/roles/pga/templates/pga_config.php.j2 | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/24f8b7f0/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 33950d6..756edea 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
@@ -66,7 +66,7 @@ zookeeper_url: "{{ groups['zookeeper'][0] }}:{{ zookeeper_client_port }}"
api_server_name: "apiserver-node0"
api_server_host: "{{ groups['api-orch'][0] }}"
api_server_port: "8930"
-api_secured: "true"
+api_secured: "false"
tls_enable: "true"
api_server_tls_port: "9930"
enable_sharing: "true"
@@ -117,6 +117,8 @@ user_data_dir: "/var/www/portals/gateway-user-data"
#airavata_server: "tls://gw77.iu.xsede.org"
airavata_server: "tls://{{ groups['api-orch'][0] }}"
airavata_port: "9930"
+# FIXME: temporarily turn off SSL verification for WSO2 IS
+auth_verify_peer: "false"
# Sharing Registry related variables
sharing_registry_host: "{{ groups['api-orch'][0] }}"
http://git-wip-us.apache.org/repos/asf/airavata/blob/24f8b7f0/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 a7e7934..e8f869b 100644
--- a/dev-tools/ansible/roles/pga/defaults/main.yml
+++ b/dev-tools/ansible/roles/pga/defaults/main.yml
@@ -49,6 +49,7 @@ admin_role_name: "admin"
admin_readonly_role_name: "admin-read-only"
user_role_name: "gateway-user"
initial_role_name: "user-pending"
+auth_verify_peer: "true"
## Airavata Client related variables
#airavata_server: "tls://gw77.iu.xsede.org"
http://git-wip-us.apache.org/repos/asf/airavata/blob/24f8b7f0/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 a8b34da..af887be 100644
--- a/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
+++ b/dev-tools/ansible/roles/pga/templates/pga_config.php.j2
@@ -74,7 +74,7 @@ return array(
/**
* Enable HTTPS server verification
*/
- 'verify-peer' => true,
+ 'verify-peer' => {{ auth_verify_peer }},
/**
* Path to the server certificate file
[3/7] airavata git commit: Disabling dreg gateway in main scigap pga
hosting env
Posted by ma...@apache.org.
Disabling dreg gateway in main scigap pga hosting env
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/a97bb13b
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/a97bb13b
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/a97bb13b
Branch: refs/heads/develop
Commit: a97bb13b5bd773376a871d4bab292863f3eea51b
Parents: beb3b43
Author: Marcus Christie <ma...@apache.org>
Authored: Mon May 1 18:42:19 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Mon May 1 18:42:19 2017 -0400
----------------------------------------------------------------------
dev-tools/ansible/pga-scigap-prod.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/a97bb13b/dev-tools/ansible/pga-scigap-prod.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/pga-scigap-prod.yml b/dev-tools/ansible/pga-scigap-prod.yml
index 6a0ed62..4f4d099 100644
--- a/dev-tools/ansible/pga-scigap-prod.yml
+++ b/dev-tools/ansible/pga-scigap-prod.yml
@@ -21,7 +21,7 @@
---
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/brandeis"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/cinetvtech"
-- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/cornell-dnasequence"
+# - include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/cornell-dnasequence"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/georgiastate"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/iugateway"
- include: pga-single-vhost.yml vars_dir="{{ inventory_dir }}/pga_config/lsu"