Update configuratios
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/f513f569 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/f513f569 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/f513f569 Branch: refs/heads/develop Commit: f513f5693582a0cddb062264c1d91e8a7bdc48b9 Parents: 72f35c1 Author: Shameera Rathnayaka <[email protected]> Authored: Fri Sep 23 12:07:42 2016 -0400 Committer: Shameera Rathnayaka <[email protected]> Committed: Fri Sep 23 12:07:42 2016 -0400 ---------------------------------------------------------------------- group_vars/all.yml | 3 ++- roles/api-orch/templates/airavata-server.properties.j2 | 2 +- roles/gfac/templates/airavata-server.properties.j2 | 2 +- roles/pga/tasks/main.yml | 12 +++++++++--- roles/pga/vars/main.yml | 4 ++-- roles/registry/templates/airavata-server.properties.j2 | 2 +- 6 files changed, 16 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/f513f569/group_vars/all.yml ---------------------------------------------------------------------- diff --git a/group_vars/all.yml b/group_vars/all.yml index d49f583..5a159c3 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml @@ -47,7 +47,7 @@ api_server_port: "8930" api_secured: "false" tls_enable: "false" api_server_tls_port: "9930" -enable_sharing: false +enable_sharing: "false" # Orchestrator related variables orchestrator_name: "orchestrator-node0" @@ -60,6 +60,7 @@ registry_name: regserver-node0 registry_host: "{{groups['registry'][0]}}" 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/" http://git-wip-us.apache.org/repos/asf/airavata/blob/f513f569/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 e36b029..b8d093e 100644 --- a/roles/api-orch/templates/airavata-server.properties.j2 +++ b/roles/api-orch/templates/airavata-server.properties.j2 @@ -49,7 +49,7 @@ enable.sharing={{enable_sharing}} default.registry.user=admin default.registry.password=admin default.registry.password.hash.method=SHA -default.registry.gateway=default +default.registry.gateway={{ default_gateway }} ########################################################################### # Application Catalog DB Configuration http://git-wip-us.apache.org/repos/asf/airavata/blob/f513f569/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 e36b029..b8d093e 100644 --- a/roles/gfac/templates/airavata-server.properties.j2 +++ b/roles/gfac/templates/airavata-server.properties.j2 @@ -49,7 +49,7 @@ enable.sharing={{enable_sharing}} default.registry.user=admin default.registry.password=admin default.registry.password.hash.method=SHA -default.registry.gateway=default +default.registry.gateway={{ default_gateway }} ########################################################################### # Application Catalog DB Configuration http://git-wip-us.apache.org/repos/asf/airavata/blob/f513f569/roles/pga/tasks/main.yml ---------------------------------------------------------------------- diff --git a/roles/pga/tasks/main.yml b/roles/pga/tasks/main.yml index 6fe1df5..b267119 100644 --- a/roles/pga/tasks/main.yml +++ b/roles/pga/tasks/main.yml @@ -39,19 +39,21 @@ - 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 + dest="{{ doc_root_dir }}" version="{{ git_branch }}" become: yes - name: Create user data dir {{ user_data_dir }} - file: path="{{ user_data_dir }}" state=directory + file: path="{{ user_data_dir }}" state=directory owner="{{user}}" group="{{group}}" mode=0777 recurse=yes become: yes #Make sure selinux is dissabled in remote machine - name: Disable selinux selinux: state=disabled become: yes + register: selinux_disable # need to restart after disable selinux - name: restart machine @@ -60,9 +62,13 @@ poll: 0 become: yes ignore_errors: true + when: (selinux_disable|success) and (selinux_disable.changed == true) + register: restart - name: waiting for server to come back local_action: wait_for host={{ inventory_hostname }} state=started delay=30 timeout=60 + when: (restart|success) and (restart.changed == true) + - name: Run composer update composer: command=update working_dir="{{ doc_root_dir }}" @@ -79,7 +85,7 @@ become: yes - name: give write permissions to storage dir - file: path="{{ doc_root_dir }}/app/storage" state=directory mode=0777 recurse=yes + file: path="{{ doc_root_dir }}/app/storage" state=directory mode=0777 owner="{{user}}" group="{{group}}" recurse=yes become: yes - name: Eanble https and http service on public zone http://git-wip-us.apache.org/repos/asf/airavata/blob/f513f569/roles/pga/vars/main.yml ---------------------------------------------------------------------- diff --git a/roles/pga/vars/main.yml b/roles/pga/vars/main.yml index 35c5122..298e897 100644 --- a/roles/pga/vars/main.yml +++ b/roles/pga/vars/main.yml @@ -17,10 +17,10 @@ oauth_client_secret: "vD9yi2ANkChzgWiih3RahrIcfsoa" #airavata_server: "tls://gw77.iu.xsede.org" airavata_server: "{{ groups['api-orch'][0] }}" airavata_port: "8930" -gateway_id: "default" +gateway_id: "{{ default_gateway }}" # relative to document root dir experiment_data_dir: "{{ user_data_dir }}" -gateway_data_store_resource_id: "gw75.iu.xsede.org_3e40e62b-be11-4590-bf24-b1b6796c3572" +gateway_data_store_resource_id: "js-170-103.jetstream-cloud.org_6497a464-3121-4b64-a7cb-d195b0a26c19" ## Portal related variables super_admin_portal: "true" http://git-wip-us.apache.org/repos/asf/airavata/blob/f513f569/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 e36b029..b8d093e 100644 --- a/roles/registry/templates/airavata-server.properties.j2 +++ b/roles/registry/templates/airavata-server.properties.j2 @@ -49,7 +49,7 @@ enable.sharing={{enable_sharing}} default.registry.user=admin default.registry.password=admin default.registry.password.hash.method=SHA -default.registry.gateway=default +default.registry.gateway={{ default_gateway }} ########################################################################### # Application Catalog DB Configuration
