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/12/02 20:25:03 UTC
[airavata] branch develop updated (dc219b3 -> e38be01)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from dc219b3 Ansible: fix 'external' commenting
add e34f3df Suppressing dangling link issues for chmod in archiving task
add 6e21645 AIRAVATA-3273 Defer copying wsgi.py since it triggers restart
add e1e0156 Updated the domain in Next TDB gateway
add 500cebd Ansible: Trigger uwsgi restart if rsynced files change
add 4da014f Deploying the new PACE Gatech gateway
add 03f5c88 Deploying the new PACE Gatech gateway
add 6d83679 Added the pace-gatech gateway to host file
add 8ecf589 Added the default SSH key for Pace
add e173246 AIRAVATA-3278 Create output staging tasks for URI_COLLECTION
new bd591c4 AIRAVATA-3230 Ansible: copy built JS out of django portal container
new 8d72333 AIRAVATA-3230 Ansible: add yarn installation
new 03b09dd AIRAVATA-3230 Ansible: mount sample settings_local.py
new 997462e AIRAVATA-3230 Ansible: move temp dir delete to end
new e38be01 Merge branch 'airavata-3230' into develop
The 5 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:
dev-tools/ansible/django.yml | 2 +
.../scigap/production/host_vars/nexttdb/vars.yml | 9 ++--
.../host_vars/{phasta => pace-gatech}/vars.yml | 26 ++++++-----
.../production/host_vars/pace-gatech/vault.yml | 15 +++++++
.../ansible/inventories/scigap/production/hosts | 1 +
dev-tools/ansible/roles/django/tasks/main.yml | 51 +++++++++++++++++-----
.../ansible/roles/django_setup/tasks/main.yml | 14 +++++-
.../helix/impl/task/staging/ArchiveTask.java | 2 +-
.../cpi/impl/SimpleOrchestratorImpl.java | 1 +
9 files changed, 92 insertions(+), 29 deletions(-)
copy dev-tools/ansible/inventories/scigap/production/host_vars/{phasta => pace-gatech}/vars.yml (54%)
create mode 100644 dev-tools/ansible/inventories/scigap/production/host_vars/pace-gatech/vault.yml
[airavata] 02/05: AIRAVATA-3230 Ansible: add yarn installation
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 8d723334d08a2a201042e5bfdd899c5b748ee304
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Dec 2 12:53:39 2019 -0500
AIRAVATA-3230 Ansible: add yarn installation
---
dev-tools/ansible/django.yml | 2 ++
dev-tools/ansible/roles/django_setup/tasks/main.yml | 14 ++++++++++++--
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dev-tools/ansible/django.yml b/dev-tools/ansible/django.yml
index cdd26ae..0d90bfa 100644
--- a/dev-tools/ansible/django.yml
+++ b/dev-tools/ansible/django.yml
@@ -35,6 +35,8 @@
when: inventory_hostname == groups['django_' + ansible_hostname][0]
- role: letsencrypt
when: inventory_hostname == groups['django_' + ansible_hostname][0]
+ - role: django_setup
+ when: inventory_hostname == groups['django_' + ansible_hostname][0]
# Create a django virtual host
- hosts: django
diff --git a/dev-tools/ansible/roles/django_setup/tasks/main.yml b/dev-tools/ansible/roles/django_setup/tasks/main.yml
index 297e568..a689d29 100644
--- a/dev-tools/ansible/roles/django_setup/tasks/main.yml
+++ b/dev-tools/ansible/roles/django_setup/tasks/main.yml
@@ -49,5 +49,15 @@
# sudo curl --silent --location https://rpm.nodesource.com/setup_8.x | sudo bash -
# sudo yum install nodejs
-# TODO: disable package-lock.json creation for the pga user
-# npm config set package-lock false
+# Install yarn
+- name: Add yarn yum repository on CentOS
+ get_url:
+ url: "https://dl.yarnpkg.com/rpm/yarn.repo"
+ dest: "/etc/yum.repos.d/yarn.repo"
+ become: yes
+ when: ansible_distribution == 'CentOS'
+
+- name: Install yarn (RedHat)
+ yum: name=yarn state=latest update_cache=yes
+ become: yes
+ when: ansible_os_family == "RedHat"
[airavata] 01/05: AIRAVATA-3230 Ansible: copy built JS out of
django portal container
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit bd591c4aa891781d12f0a014f2a848516ed268ac
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Nov 25 16:32:41 2019 -0500
AIRAVATA-3230 Ansible: copy built JS out of django portal container
---
dev-tools/ansible/roles/django/tasks/main.yml | 37 +++++++++++++++++++--------
1 file changed, 26 insertions(+), 11 deletions(-)
diff --git a/dev-tools/ansible/roles/django/tasks/main.yml b/dev-tools/ansible/roles/django/tasks/main.yml
index 5c8f6d2..4888533 100644
--- a/dev-tools/ansible/roles/django/tasks/main.yml
+++ b/dev-tools/ansible/roles/django/tasks/main.yml
@@ -77,25 +77,33 @@
# when: not docker_result.can_talk_to_docker
# run_once: true
-- name: build Docker image for building the JS
+- name: build airavata-django-portal Docker image
local_action:
module: docker_image
- path: "{{ airavata_django_portal_tempdir.path }}/scripts/docker-build/"
- name: airavata-django-build
+ path: "{{ airavata_django_portal_tempdir.path }}/"
+ name: airavata-django-portal
force: true
# source: build
run_once: true
-- name: build Django JS code in Docker container
+- name: create Docker container so we can copy built files out of it
local_action:
module: docker_container
- name: ansible-airavata-django-build
- image: airavata-django-build
- cleanup: true
- detach: false
- volumes:
- - "{{ airavata_django_portal_tempdir.path }}:/code"
- - "{{ lookup('env', 'HOME') }}/.npm:/root/.npm"
+ # Don't need to start the container, just create it
+ state: present
+ name: ansible-airavata-django-portal
+ image: airavata-django-portal
+ run_once: true
+
+- name: copy built JS files from Docker container
+ local_action: command docker cp ansible-airavata-django-portal:/code/. {{ airavata_django_portal_tempdir.path }}
+ run_once: true
+
+- name: remove Docker container
+ local_action:
+ module: docker_container
+ state: absent
+ name: ansible-airavata-django-portal
run_once: true
- name: rsync build Django code to {{ airavata_django_checkout }}
@@ -114,6 +122,13 @@
notify:
- restart uwsgi
+- name: remove Django portal clone temp directory
+ local_action:
+ module: file
+ state: absent
+ path: "{{ airavata_django_portal_tempdir.path }}"
+ run_once: true
+
- name: Create virtual environment for Django portal and install dependencies
pip:
requirements: "{{ item }}"
[airavata] 03/05: AIRAVATA-3230 Ansible: mount sample
settings_local.py
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 03b09dd5f0aa8391fb7780845deb8b099fd4ec5a
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Dec 2 15:07:43 2019 -0500
AIRAVATA-3230 Ansible: mount sample settings_local.py
---
dev-tools/ansible/roles/django/tasks/main.yml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dev-tools/ansible/roles/django/tasks/main.yml b/dev-tools/ansible/roles/django/tasks/main.yml
index 4888533..492f119 100644
--- a/dev-tools/ansible/roles/django/tasks/main.yml
+++ b/dev-tools/ansible/roles/django/tasks/main.yml
@@ -93,6 +93,8 @@
state: present
name: ansible-airavata-django-portal
image: airavata-django-portal
+ volumes:
+ - "{{ airavata_django_portal_tempdir.path }}/django_airavata/settings_local.py.sample:/code/django_airavata/settings_local.py"
run_once: true
- name: copy built JS files from Docker container
[airavata] 05/05: Merge branch 'airavata-3230' into develop
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit e38be012ebb12cd6fed9b6472280e6c63153dece
Merge: dc219b3 997462e
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Dec 2 15:23:41 2019 -0500
Merge branch 'airavata-3230' into develop
dev-tools/ansible/django.yml | 2 +
.../scigap/production/host_vars/nexttdb/vars.yml | 9 ++--
.../host_vars/{nexttdb => pace-gatech}/vars.yml | 26 ++++++-----
.../production/host_vars/pace-gatech/vault.yml | 15 +++++++
.../ansible/inventories/scigap/production/hosts | 1 +
dev-tools/ansible/roles/django/tasks/main.yml | 51 +++++++++++++++++-----
.../ansible/roles/django_setup/tasks/main.yml | 14 +++++-
.../helix/impl/task/staging/ArchiveTask.java | 2 +-
.../cpi/impl/SimpleOrchestratorImpl.java | 1 +
9 files changed, 92 insertions(+), 29 deletions(-)
[airavata] 04/05: AIRAVATA-3230 Ansible: move temp dir delete to end
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 997462e906816ea873ceaea40c1e5351c5cd0a06
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Dec 2 15:08:11 2019 -0500
AIRAVATA-3230 Ansible: move temp dir delete to end
---
dev-tools/ansible/roles/django/tasks/main.yml | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/dev-tools/ansible/roles/django/tasks/main.yml b/dev-tools/ansible/roles/django/tasks/main.yml
index 492f119..37ded3e 100644
--- a/dev-tools/ansible/roles/django/tasks/main.yml
+++ b/dev-tools/ansible/roles/django/tasks/main.yml
@@ -124,13 +124,6 @@
notify:
- restart uwsgi
-- name: remove Django portal clone temp directory
- local_action:
- module: file
- state: absent
- path: "{{ airavata_django_portal_tempdir.path }}"
- run_once: true
-
- name: Create virtual environment for Django portal and install dependencies
pip:
requirements: "{{ item }}"
@@ -257,3 +250,10 @@
become: yes
notify:
- restart uwsgi
+
+- name: remove Django portal clone temp directory
+ local_action:
+ module: file
+ state: absent
+ path: "{{ airavata_django_portal_tempdir.path }}"
+ run_once: true