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 2019/06/26 18:32:41 UTC
[airavata] branch staging updated (9366175 -> b769e6d)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from 9366175 Fixing order of table creation
new f915139 deduplicate user_profile_phone
new 6b4f64f update order of table drops
new b769e6d Updating staging environment inventory
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../scigap/staging/group_vars/all/vars.yml | 21 ++++++++++++++-------
dev-tools/ansible/inventories/scigap/staging/hosts | 16 +++++++---------
.../DeltaScripts/profile_service_schema_delta.sql | 7 +++++++
.../DeltaScripts/replicaCatalog_schema_delta.sql | 4 ++--
4 files changed, 30 insertions(+), 18 deletions(-)
[airavata] 03/03: Updating staging environment inventory
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit b769e6da03f572d987925b20ec3577d141207f59
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Jun 26 14:32:32 2019 -0400
Updating staging environment inventory
---
.../scigap/staging/group_vars/all/vars.yml | 21 ++++++++++++++-------
dev-tools/ansible/inventories/scigap/staging/hosts | 16 +++++++---------
2 files changed, 21 insertions(+), 16 deletions(-)
diff --git a/dev-tools/ansible/inventories/scigap/staging/group_vars/all/vars.yml b/dev-tools/ansible/inventories/scigap/staging/group_vars/all/vars.yml
index a49db72..9da8ae5 100644
--- a/dev-tools/ansible/inventories/scigap/staging/group_vars/all/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/staging/group_vars/all/vars.yml
@@ -19,8 +19,7 @@
#
---
-ansible_connection: ssh
-ansible_user: centos
+ansible_user: root
user: airavata
group: airavata
@@ -30,9 +29,8 @@ user_home: "/home/{{ user }}"
deployment_dir: "{{ user_home }}/staging-deployment"
airavata_source_dir: "{{ user_home }}/staging-source"
airavata_repo: "https://github.com/apache/airavata.git"
-airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
+airavata_dist: "apache-airavata-api-server-0.19-SNAPSHOT"
airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz"
-old_airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
git_branch: staging
# Database related variables
@@ -65,7 +63,7 @@ zookeeper_connection_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: "false"
+api_secured: "true"
tls_enable: "true"
api_server_tls_port: "9930"
enable_sharing: "true"
@@ -112,6 +110,7 @@ monitor_email_password: "{{ vault_monitor_email_password }}"
# PGA variables
pga_repo: "https://github.com/apache/airavata-php-gateway.git"
+pga_git_branch: "staging"
user_data_dir: "/var/www/portals/gateway-user-data"
real_user_data_dir: "/data/gateway-user-data"
## Airavata Client related variables
@@ -144,7 +143,7 @@ helix_version: 0.7.1
helix_url: http://www-us.apache.org/dist//helix/{{helix_version}}/binaries/helix-core-{{helix_version}}-pkg.tar
helix_dir: "{{ deployment_dir }}/airavata-helix"
helix_cluster_name: "AiravataDemoCluster"
-snapshot_version: "0.17-SNAPSHOT"
+snapshot_version: "0.19-SNAPSHOT"
helix_controller_name: "helixcontroller"
helix_participant_name: "helixparticipant"
helix_pre_wm_name: "prewm"
@@ -171,4 +170,12 @@ job_monitor_broker_consumer_group: "MonitoringConsumer"
platform_name: "Staging Environment"
platform_monitor_email_address: "airavataplatformmonitor@gmail.com"
platform_monitor_email_password: "{{ vault_platform_monitor_email_password }}"
-platform_monitor_target_email_addresses: "dimuthu.upeksha2@gmail.com,dwannipu@iu.edu"
\ No newline at end of file
+platform_monitor_target_email_addresses: "dimuthu.upeksha2@gmail.com,dwannipu@iu.edu"
+
+# Variables related to parser framework
+parser_broker_url: "{{ groups['kafka'][0] }}:{{ kafka_listener_port }}"
+parser_broker_topic: "completed-messages"
+parser_broker_consumer_group: "ParsingConsumer"
+# TODO: update storage resource id
+parser_storage_resource_id: "pgadev.scigap.org_7ddf28fd-d503-4ff8-bbc5-3279a7c3b99e"
+parser_broker_publisher_id: "ParserProducer"
diff --git a/dev-tools/ansible/inventories/scigap/staging/hosts b/dev-tools/ansible/inventories/scigap/staging/hosts
index 3508888..6e02a7a 100644
--- a/dev-tools/ansible/inventories/scigap/staging/hosts
+++ b/dev-tools/ansible/inventories/scigap/staging/hosts
@@ -1,27 +1,25 @@
# inventory file : scigap staging deployment
[zookeeper]
-api.staging.scigap.org
-#helix.staging.scigap.org
-#pga.staging.scigap.org
+scigap02.sciencegateways.iu.edu
[rabbitmq]
-api.staging.scigap.org
+scigap02.sciencegateways.iu.edu
[database]
-db.staging.scigap.org
+scigap01.sciencegateways.iu.edu
[api-orch]
-api.staging.scigap.org
+scigap02.sciencegateways.iu.edu
[helix]
-helix.staging.scigap.org ansible_user=root
+scigap03.sciencegateways.iu.edu
[kafka]
-helix.staging.scigap.org ansible_user=root
+scigap03.sciencegateways.iu.edu
[pga]
-pga.staging.scigap.org
+TODO
# Using the same keycloak as production
#[keycloak]
[airavata] 01/03: deduplicate user_profile_phone
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit f915139137e4f1ee2edb48ada39470b3ad02287b
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Jun 26 14:07:40 2019 -0400
deduplicate user_profile_phone
---
.../next/DeltaScripts/profile_service_schema_delta.sql | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/modules/registry/release-migration-scripts/next/DeltaScripts/profile_service_schema_delta.sql b/modules/registry/release-migration-scripts/next/DeltaScripts/profile_service_schema_delta.sql
index 16af7b3..e0ff787 100644
--- a/modules/registry/release-migration-scripts/next/DeltaScripts/profile_service_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/next/DeltaScripts/profile_service_schema_delta.sql
@@ -41,6 +41,13 @@ ALTER TABLE `USER_PROFILE_LABELED_URI` ADD PRIMARY KEY IF NOT EXISTS (`AIRAVATA_
ALTER TABLE `USER_PROFILE_LABELED_URI` DROP INDEX IF EXISTS `AIRAVATA_INTERNAL_USER_ID`;
ALTER TABLE `USER_PROFILE_NATIONALITY` ADD PRIMARY KEY IF NOT EXISTS (`AIRAVATA_INTERNAL_USER_ID`,`NATIONALITY`);
ALTER TABLE `USER_PROFILE_NATIONALITY` DROP INDEX IF EXISTS `AIRAVATA_INTERNAL_USER_ID`;
+
+-- deduplicate phone records
+CREATE TABLE USER_PROFILE_PHONE_TEMP SELECT DISTINCT AIRAVATA_INTERNAL_USER_ID, PHONE FROM USER_PROFILE_PHONE;
+TRUNCATE USER_PROFILE_PHONE;
+INSERT INTO USER_PROFILE_PHONE SELECT * FROM USER_PROFILE_PHONE_TEMP;
+DROP TABLE USER_PROFILE_PHONE_TEMP;
+
ALTER TABLE `USER_PROFILE_PHONE` ADD PRIMARY KEY IF NOT EXISTS (`AIRAVATA_INTERNAL_USER_ID`,`PHONE`);
ALTER TABLE `USER_PROFILE_PHONE` DROP INDEX IF EXISTS `AIRAVATA_INTERNAL_USER_ID`;
ALTER TABLE `NSF_DEMOGRAPHIC_DISABILITY` CHANGE `AIRAVATA_INTERNAL_USER_ID` `AIRAVATA_INTERNAL_USER_ID` varchar(255) NOT NULL;
[airavata] 02/03: update order of table drops
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 6b4f64f40bb9991cc6f6b1fb7f257950b862ae32
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Jun 26 14:12:10 2019 -0400
update order of table drops
---
.../next/DeltaScripts/replicaCatalog_schema_delta.sql | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/modules/registry/release-migration-scripts/next/DeltaScripts/replicaCatalog_schema_delta.sql b/modules/registry/release-migration-scripts/next/DeltaScripts/replicaCatalog_schema_delta.sql
index d943ffc..0645e1c 100644
--- a/modules/registry/release-migration-scripts/next/DeltaScripts/replicaCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/next/DeltaScripts/replicaCatalog_schema_delta.sql
@@ -29,13 +29,13 @@ set FOREIGN_KEY_CHECKS=1;
-- AIRAVATA-2938: bring database schema into sync with registry-refactoring DB init scripts
-- somehow these workflow tables got created in the replica_catalog schema
DROP TABLE IF EXISTS `PORT`;
-DROP TABLE IF EXISTS `WORKFLOW`;
DROP TABLE IF EXISTS `WORKFLOW_OUTPUT`;
DROP TABLE IF EXISTS `WORKFLOW_STATUS`;
-DROP TABLE IF EXISTS `NODE`;
DROP TABLE IF EXISTS `WORKFLOW_INPUT`;
+DROP TABLE IF EXISTS `NODE`;
DROP TABLE IF EXISTS `COMPONENT_STATUS`;
DROP TABLE IF EXISTS `EDGE`;
+DROP TABLE IF EXISTS `WORKFLOW`;
set FOREIGN_KEY_CHECKS=0;
ALTER TABLE `DATA_PRODUCT` CHANGE `PRODUCT_TYPE` `PRODUCT_TYPE` varchar(10) DEFAULT NULL;
ALTER TABLE `DATA_REPLICA_LOCATION` CHANGE `REPLICA_LOCATION_CATEGORY` `REPLICA_LOCATION_CATEGORY` varchar(26) DEFAULT NULL;