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/06/16 13:38:39 UTC
[1/3] airavata git commit: Ansible - airavata servers for dev SciGaP
deploy
Repository: airavata
Updated Branches:
refs/heads/develop 2075f41e1 -> 9a2738574
Ansible - airavata servers for dev SciGaP deploy
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/0429d372
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/0429d372
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/0429d372
Branch: refs/heads/develop
Commit: 0429d37206c4cb67377680a044799b730254b8ca
Parents: 2075f41
Author: Marcus Christie <ma...@apache.org>
Authored: Thu Jun 15 14:03:01 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Thu Jun 15 15:42:17 2017 -0400
----------------------------------------------------------------------
.../ansible/inventories/scigap/develop/group_vars/all/vars.yml | 2 +-
dev-tools/ansible/roles/api-orch/tasks/main.yml | 2 ++
dev-tools/ansible/roles/zookeeper/tasks/main.yml | 3 +++
3 files changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/0429d372/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
index c2376fe..4df4707 100644
--- a/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/group_vars/all/vars.yml
@@ -67,7 +67,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"
http://git-wip-us.apache.org/repos/asf/airavata/blob/0429d372/dev-tools/ansible/roles/api-orch/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/api-orch/tasks/main.yml b/dev-tools/ansible/roles/api-orch/tasks/main.yml
index 7c1259f..e6cf3f1 100644
--- a/dev-tools/ansible/roles/api-orch/tasks/main.yml
+++ b/dev-tools/ansible/roles/api-orch/tasks/main.yml
@@ -50,6 +50,7 @@
cred_store_server_host: "{{ ansible_default_ipv4.address }}"
registry_host: "{{ ansible_default_ipv4.address }}"
sharing_registry_host: "{{ ansible_default_ipv4.address }}"
+ profile_service_host: "{{ ansible_default_ipv4.address }}"
- name: Copy Airavata server properties file
@@ -90,6 +91,7 @@
- "{{ orchestrator_port }}/tcp"
- "{{ cred_store_port }}/tcp"
- "{{ registry_port }}/tcp"
+ - "{{ profile_service_port }}/tcp"
become_user: root
- name: stop api-orch
http://git-wip-us.apache.org/repos/asf/airavata/blob/0429d372/dev-tools/ansible/roles/zookeeper/tasks/main.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/zookeeper/tasks/main.yml b/dev-tools/ansible/roles/zookeeper/tasks/main.yml
index 3563247..08d68b8 100644
--- a/dev-tools/ansible/roles/zookeeper/tasks/main.yml
+++ b/dev-tools/ansible/roles/zookeeper/tasks/main.yml
@@ -27,6 +27,7 @@
copy=no
owner="{{ user }}"
group="{{ group }}"
+ become: yes
- name: open zookeeper port
firewalld: port=2181/tcp zone=public permanent=true state=enabled immediate=yes
@@ -36,10 +37,12 @@
template: src=zoo.cfg.j2 dest="{{ zookeeper_dir }}/conf/zoo.cfg" owner="{{ user }}" group="{{ group }}" mode="u=rw,g=r,o=r"
notify:
- restart zookeeper
+ become: yes
- name: Check if systemd exists
stat: path=/usr/lib/systemd/system/
register: systemd_check
+ become: yes
- name: Systemd script.
template: src=zookeeper.service.j2 dest=/usr/lib/systemd/system/zookeeper.service
[2/3] airavata git commit: MigrationManager: allow connecting to
secure Airavata
Posted by ma...@apache.org.
MigrationManager: allow connecting to secure Airavata
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/225b09c1
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/225b09c1
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/225b09c1
Branch: refs/heads/develop
Commit: 225b09c1ffa570cf9d8f7f895cbd4e2059c14976
Parents: 0429d37
Author: Marcus Christie <ma...@apache.org>
Authored: Fri Jun 16 09:34:06 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Fri Jun 16 09:34:06 2017 -0400
----------------------------------------------------------------------
.../src/main/java/org/apache/airavata/MigrationManager.java | 9 ++++++++-
.../user-profile-migration.properties.template | 1 +
2 files changed, 9 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/225b09c1/modules/user-profile-migration/src/main/java/org/apache/airavata/MigrationManager.java
----------------------------------------------------------------------
diff --git a/modules/user-profile-migration/src/main/java/org/apache/airavata/MigrationManager.java b/modules/user-profile-migration/src/main/java/org/apache/airavata/MigrationManager.java
index b8baeaf..524c024 100644
--- a/modules/user-profile-migration/src/main/java/org/apache/airavata/MigrationManager.java
+++ b/modules/user-profile-migration/src/main/java/org/apache/airavata/MigrationManager.java
@@ -56,6 +56,7 @@ public class MigrationManager {
private int profileServiceServerPort = 8962;
private String airavataServiceServerHost = "localhost";
private int airavataServiceServerPort = 8930;
+ private boolean airavataServiceSecure = false;
private Map<String,String> roleConversionMap = createDefaultRoleConversionMap();
private String gatewayId = "gateway-id";
private String wso2ISAdminUsername = "username";
@@ -89,6 +90,7 @@ public class MigrationManager {
private final static String WSO2IS_GATEWAY_PROVIDER_ROLENAME = "wso2is.gateway-provider.rolename";
private final static String AIRAVATA_SERVICE_HOST = "airavata.service.host";
private final static String AIRAVATA_SERVICE_PORT = "airavata.service.port";
+ private final static String AIRAVATA_SERVICE_SECURE = "airavata.service.secure";
private final static String PROFILE_SERVICE_HOST = "profile.service.host";
private final static String PROFILE_SERVICE_PORT = "profile.service.port";
private final static String KEYCLOAK_ADMIN_USERNAME = "keycloak.admin.username";
@@ -202,6 +204,10 @@ public class MigrationManager {
return AiravataClientFactory.createAiravataClient(airavataServiceServerHost, airavataServiceServerPort);
}
+ private Airavata.Client getAiravataSecureClient() throws AiravataClientException {
+ return AiravataClientFactory.createAiravataSecureClient(airavataServiceServerHost, airavataServiceServerPort, keycloakTrustStorePath, keycloakTrustStorePassword, 10000);
+ }
+
private IamAdminServices.Client getIamAdminServicesClient() throws IamAdminServicesException {
return ProfileServiceClientFactory.createIamAdminServiceClient(profileServiceServerHost, profileServiceServerPort);
}
@@ -218,7 +224,7 @@ public class MigrationManager {
private boolean migrateGatewayProfileToAiravata() throws TException {
TenantProfileService.Client tenantProfileServiceClient = getTenantProfileServiceClient();
- Airavata.Client airavataClient = getAiravataClient();
+ Airavata.Client airavataClient = airavataServiceSecure ? getAiravataSecureClient() : getAiravataClient();
IamAdminServices.Client iamAdminServicesClient = getIamAdminServicesClient();
// Get Gateway from Airavata API
@@ -318,6 +324,7 @@ public class MigrationManager {
this.wso2ISAdminPassword = properties.getProperty(WSO2IS_ADMIN_PASSWORD, this.wso2ISAdminPassword);
this.airavataServiceServerHost = properties.getProperty(AIRAVATA_SERVICE_HOST, this.airavataServiceServerHost);
this.airavataServiceServerPort = Integer.valueOf(properties.getProperty(AIRAVATA_SERVICE_PORT, Integer.toString(this.airavataServiceServerPort)));
+ this.airavataServiceSecure = Boolean.valueOf(properties.getProperty(AIRAVATA_SERVICE_SECURE, "false"));
this.profileServiceServerHost = properties.getProperty(PROFILE_SERVICE_HOST, this.profileServiceServerHost);
this.profileServiceServerPort = Integer.valueOf(properties.getProperty(PROFILE_SERVICE_PORT, Integer.toString(this.profileServiceServerPort)));
this.keycloakServiceURL = properties.getProperty(KEYCLOAK_SERVICE_URL, this.keycloakServiceURL);
http://git-wip-us.apache.org/repos/asf/airavata/blob/225b09c1/modules/user-profile-migration/user-profile-migration.properties.template
----------------------------------------------------------------------
diff --git a/modules/user-profile-migration/user-profile-migration.properties.template b/modules/user-profile-migration/user-profile-migration.properties.template
index aeacef5..86e664c 100644
--- a/modules/user-profile-migration/user-profile-migration.properties.template
+++ b/modules/user-profile-migration/user-profile-migration.properties.template
@@ -19,6 +19,7 @@ wso2is.gateway-provider.rolename = gateway-provider
# Airavata Service settings
airavata.service.host = localhost
airavata.service.port = 8930
+airavata.service.secure = false
# Profile Service settings
profile.service.host = localhost
[3/3] airavata git commit: Adding spaces between terms in Tenant
Profile queries
Posted by ma...@apache.org.
Adding spaces between terms in Tenant Profile queries
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/9a273857
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/9a273857
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/9a273857
Branch: refs/heads/develop
Commit: 9a27385743bac0a16cd63011095e6c6384c05863
Parents: 225b09c
Author: Marcus Christie <ma...@apache.org>
Authored: Fri Jun 16 09:38:07 2017 -0400
Committer: Marcus Christie <ma...@apache.org>
Committed: Fri Jun 16 09:38:07 2017 -0400
----------------------------------------------------------------------
.../airavata/service/profile/commons/utils/QueryConstants.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/9a273857/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/QueryConstants.java
----------------------------------------------------------------------
diff --git a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/QueryConstants.java b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/QueryConstants.java
index b440ecc..caa72d9 100644
--- a/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/QueryConstants.java
+++ b/airavata-services/profile-service/profile-service-commons/src/main/java/org/apache/airavata/service/profile/commons/utils/QueryConstants.java
@@ -17,11 +17,11 @@ public class QueryConstants {
"where u.gatewayId LIKE :" + UserProfile._Fields.GATEWAY_ID.getFieldName() + "";
public static final String FIND_GATEWAY_BY_ID = "SELECT g FROM GatewayEntity g " +
- "where g.gatewayId LIKE :" + Gateway._Fields.GATEWAY_ID.getFieldName() +
+ "where g.gatewayId LIKE :" + Gateway._Fields.GATEWAY_ID.getFieldName() + " " +
"AND g.gatewayApprovalStatus LIKE :" + Gateway._Fields.GATEWAY_APPROVAL_STATUS.getFieldName();
public static final String GET_ALL_GATEWAYS = "SELECT g FROM GatewayEntity g";
- public static final String GET_USER_GATEWAYS = "SELECT g from GatewayEntity g" +
+ public static final String GET_USER_GATEWAYS = "SELECT g from GatewayEntity g " +
"where g.requesterUsername LIKE :" + Gateway._Fields.REQUESTER_USERNAME.getFieldName() + "";
}