airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sma...@apache.org
Subject [22/50] airavata git commit: AIRAVATA-2335 Updating with Anuj's DB info
Date Mon, 03 Apr 2017 16:49:55 GMT
AIRAVATA-2335 Updating with Anuj's DB info

Also deleting untested CentOS 6 PGA install script.


Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/ed6cbf65
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/ed6cbf65
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/ed6cbf65

Branch: refs/heads/master
Commit: ed6cbf656dc1745e42463ef1af0ea053c8a86eae
Parents: 58c3d52
Author: Marcus Christie <machristie@apache.org>
Authored: Mon Mar 20 09:35:50 2017 -0400
Committer: Marcus Christie <machristie@apache.org>
Committed: Mon Mar 20 09:35:50 2017 -0400

----------------------------------------------------------------------
 .../inventories/testing-0.17/group_vars/all.yml | 91 --------------------
 .../testing-0.17/group_vars/all/vars.yml        | 91 ++++++++++++++++++++
 .../ansible/inventories/testing-0.17/hosts      |  2 +-
 .../roles/pga/tasks/install_deps_CentOS_6.yml   | 33 -------
 4 files changed, 92 insertions(+), 125 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/airavata/blob/ed6cbf65/dev-tools/ansible/inventories/testing-0.17/group_vars/all.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/group_vars/all.yml b/dev-tools/ansible/inventories/testing-0.17/group_vars/all.yml
deleted file mode 100644
index 6818d31..0000000
--- a/dev-tools/ansible/inventories/testing-0.17/group_vars/all.yml
+++ /dev/null
@@ -1,91 +0,0 @@
----
-
-user: centos
-group: centos
-user_home: "/home/{{ user }}"
-
-# deployment related variables
-deployment_dir: "{{ user_home }}/deployment"
-airavata_source_dir: "{{ user_home }}/source"
-airavata_repo: "https://git-wip-us.apache.org/repos/asf/airavata.git"
-airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
-airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz"
-old_airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
-git_branch: develop
-
-# Database related variables
-db_server: "{{ groups['database'][0] }}"
-db_server_port: "3306"
-db_user: "airavata"
-db_password: "airavata"
-app_catalog: "app_catalog"
-exp_catalog: "exp_catalog"
-replica_catalog: "replica_catalog"
-sharing_catalog: "sharing_catalog"
-workflow_catalog: "wf_catalog"
-credential_store: "credential_store"
-
-mysql_connector_jar: "mysql-connector-java-5.1.37-bin.jar"
-
-# Rabbitmq related vareables
-rabbitmq_server: "{{ ansible_fqdn }}"
-rabbitmq_vhost: "develop"
-rabbitmq_user: "airavata"
-rabbitmq_password: "airavata"
-rabbitmq_port: "5672"
-rabbitmq_broker_url: "amqp://{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ rabbitmq_server}}:{{
rabbitmq_port }}/{{ rabbitmq_vhost }}"
-
-# Zoookeeper related variables
-zookeeper_client_port: 2181
-zookeeper_url: "{{ groups['zookeeper'][0] }}:{{ zookeeper_client_port }}"
-# API Server related variables
-api_server_name: "apiserver-node0"
-api_server_host: "{{ansible_fqdn}}"
-api_server_port: "8930"
-api_secured: "false"
-tls_enable: "false"
-api_server_tls_port: "9930"
-enable_sharing: "true"
-
-# Orchestrator  related variables
-orchestrator_name: "orchestrator-node0"
-orchestrator_host: "{{ansible_fqdn}}"
-orchestrator_port: "8940"
-api_orch_dir: "{{ deployment_dir }}/api-orchestrator"
-api_orch_server_names: "api-orch"
-
-# registry related variables
-registry_name: regserver-node0
-registry_host: "{{ ansible_fqdn }}"
-registry_port: 8970
-#registry_dir: "{{ deployment_dir }}/registry"
-default_gateway: "php_reference_gateway"
-
-# Credential and keystore related variables
-#authorization_server: "https://{{ groups['wso2is'][0]}}:9443/services/"
-authorization_server: "https://idp.scigap.org:9443/services/"
-keystore: "airavata.jks"
-keystore_passwd: "airavata"
-#client_truststore: "client_truststore.jks"
-client_truststore: "airavata.jks"
-client_truststore_passwd: "airavata"
-cred_keystore: "airavata_sym.jks"
-cred_keystore_passwd: "airavata"
-cred_keystore_alias: "airavata"
-cred_store_server_host: "{{ ansible_fqdn }}"
-cred_store_port: "8960"
-keystores_location: "{{ deployment_dir }}/keystores"
-
-# Gfac related variables
-gfac_name: "gfac-node0"
-gfac_host: "{{ ansible_fqdn }}"
-gfac_port: "8950"
-gfac_dir: "{{ deployment_dir }}/gfac-instance"
-
-# Monitoring variables
-monitor_email_address: "test.airavata@gmail.com"
-monitor_email_password: "airavata"
-
-# Sharing Registry related variables
-sharing_registry_host: "{{ ansible_fqdn }}"
-sharing_registry_port: 7878

http://git-wip-us.apache.org/repos/asf/airavata/blob/ed6cbf65/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml b/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
new file mode 100644
index 0000000..408a77b
--- /dev/null
+++ b/dev-tools/ansible/inventories/testing-0.17/group_vars/all/vars.yml
@@ -0,0 +1,91 @@
+---
+
+user: centos
+group: centos
+user_home: "/home/{{ user }}"
+
+# deployment related variables
+deployment_dir: "{{ user_home }}/deployment"
+airavata_source_dir: "{{ user_home }}/source"
+airavata_repo: "https://git-wip-us.apache.org/repos/asf/airavata.git"
+airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
+airavata_dist_name: "{{ airavata_dist }}-bin.tar.gz"
+old_airavata_dist: "apache-airavata-server-0.17-SNAPSHOT"
+git_branch: develop
+
+# Database related variables
+db_server: "{{ groups['database'][0] }}"
+db_server_port: "3306"
+db_user: "airavata"
+db_password: "{{ vault_db_password }}"
+app_catalog: "app_catalog"
+exp_catalog: "exp_catalog"
+replica_catalog: "replica_catalog"
+sharing_catalog: "sharing_catalog"
+workflow_catalog: "wf_catalog"
+credential_store: "credential_store"
+
+mysql_connector_jar: "mysql-connector-java-5.1.37-bin.jar"
+
+# Rabbitmq related vareables
+rabbitmq_server: "{{ ansible_fqdn }}"
+rabbitmq_vhost: "develop"
+rabbitmq_user: "airavata"
+rabbitmq_password: "airavata"
+rabbitmq_port: "5672"
+rabbitmq_broker_url: "amqp://{{ rabbitmq_user }}:{{ rabbitmq_password }}@{{ rabbitmq_server}}:{{
rabbitmq_port }}/{{ rabbitmq_vhost }}"
+
+# Zoookeeper related variables
+zookeeper_client_port: 2181
+zookeeper_url: "{{ groups['zookeeper'][0] }}:{{ zookeeper_client_port }}"
+# API Server related variables
+api_server_name: "apiserver-node0"
+api_server_host: "{{ansible_fqdn}}"
+api_server_port: "8930"
+api_secured: "false"
+tls_enable: "false"
+api_server_tls_port: "9930"
+enable_sharing: "true"
+
+# Orchestrator  related variables
+orchestrator_name: "orchestrator-node0"
+orchestrator_host: "{{ansible_fqdn}}"
+orchestrator_port: "8940"
+api_orch_dir: "{{ deployment_dir }}/api-orchestrator"
+api_orch_server_names: "api-orch"
+
+# registry related variables
+registry_name: regserver-node0
+registry_host: "{{ ansible_fqdn }}"
+registry_port: 8970
+#registry_dir: "{{ deployment_dir }}/registry"
+default_gateway: "php_reference_gateway"
+
+# Credential and keystore related variables
+#authorization_server: "https://{{ groups['wso2is'][0]}}:9443/services/"
+authorization_server: "https://idp.scigap.org:9443/services/"
+keystore: "airavata.jks"
+keystore_passwd: "airavata"
+#client_truststore: "client_truststore.jks"
+client_truststore: "airavata.jks"
+client_truststore_passwd: "airavata"
+cred_keystore: "airavata_sym.jks"
+cred_keystore_passwd: "airavata"
+cred_keystore_alias: "airavata"
+cred_store_server_host: "{{ ansible_fqdn }}"
+cred_store_port: "8960"
+keystores_location: "{{ deployment_dir }}/keystores"
+
+# Gfac related variables
+gfac_name: "gfac-node0"
+gfac_host: "{{ ansible_fqdn }}"
+gfac_port: "8950"
+gfac_dir: "{{ deployment_dir }}/gfac-instance"
+
+# Monitoring variables
+monitor_email_address: "test.airavata@gmail.com"
+monitor_email_password: "airavata"
+
+# Sharing Registry related variables
+sharing_registry_host: "{{ ansible_fqdn }}"
+sharing_registry_port: 7878

http://git-wip-us.apache.org/repos/asf/airavata/blob/ed6cbf65/dev-tools/ansible/inventories/testing-0.17/hosts
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/inventories/testing-0.17/hosts b/dev-tools/ansible/inventories/testing-0.17/hosts
index ce939fb..80b186e 100644
--- a/dev-tools/ansible/inventories/testing-0.17/hosts
+++ b/dev-tools/ansible/inventories/testing-0.17/hosts
@@ -5,7 +5,7 @@
 149.165.168.5 ansible_user=centos
 
 [database]
-149.165.168.5 ansible_user=centos
+149.165.172.163 ansible_user=centos
 
 [api-orch]
 149.165.168.5 ansible_user=centos

http://git-wip-us.apache.org/repos/asf/airavata/blob/ed6cbf65/dev-tools/ansible/roles/pga/tasks/install_deps_CentOS_6.yml
----------------------------------------------------------------------
diff --git a/dev-tools/ansible/roles/pga/tasks/install_deps_CentOS_6.yml b/dev-tools/ansible/roles/pga/tasks/install_deps_CentOS_6.yml
deleted file mode 100644
index 8da9aa3..0000000
--- a/dev-tools/ansible/roles/pga/tasks/install_deps_CentOS_6.yml
+++ /dev/null
@@ -1,33 +0,0 @@
----
-
-- name: Install pre-requisites
-  yum: name="{{ item }}" state=latest update_cache=yes
-  with_items:
-    - git
-    - httpd
-    - php
-    - php-soap
-    - libselinux-python
-    - php-pdo
-  become: yes
-#"
-
-# - name: Allow selinux outbound connection from web server
-  # command: setsebool -P httpd_can_network_connect 1
-
-- name: install composer
-  shell: curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin
--filename=composer
-  args:
-    creates: /usr/local/bin/composer
-  become: yes
-
-- name: install epel release
-  yum: name=epel-release state=present
-  become: yes
-
-#OS_dep
-# depend on epel release
-- name: install mcrypt
-  yum: name=php-mcrypt state=latest update_cache=yes
-  become: yes
-


Mime
View raw message