This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch RPID+SEAGrid in repository https://gitbox.apache.org/repos/asf/airavata.git
commit bb987327ab99589978937d11a86548d875aedd95 Merge: 06efd19 ca9671d Author: Marcus Christie <[email protected]> AuthorDate: Fri Jan 31 16:19:51 2020 -0500 Merge branch 'develop' into RPID+SEAGrid .../scigap/develop/group_vars/django/vars.yml | 1 + .../scigap/develop/host_vars/amp/vars.yml | 16 ++--- .../simccs/files/django-ssl-vhost.conf.j2 | 1 + .../scigap/develop/host_vars/simccs/vars.yml | 7 ++- .../scigap/production/group_vars/all/vars.yml | 7 +++ .../scigap/production/group_vars/django/vars.yml | 1 + .../scigap/production/host_vars/cgpe/vars.yml | 8 +-- .../scigap/production/host_vars/csbglsu/vars.yml | 8 +-- .../scigap/production/host_vars/delta/vars.yml | 3 +- .../files/django-ssl-vhost.conf.j2 | 16 +++-- .../scigap/production/host_vars/dreg/vars.yml | 1 + .../scigap/production/host_vars/newsimccs/vars.yml | 70 ---------------------- .../production/host_vars/newsimccs/vault.yml | 15 ----- .../scigap/production/host_vars/simccs/vars.yml | 15 +++-- .../host_vars/{testdrive => smaltr}/vars.yml | 26 ++++---- .../scigap/production/host_vars/smaltr/vault.yml | 15 +++++ .../scigap/production/host_vars/testdrive/vars.yml | 2 +- .../host_vars/{testdrive => toppic}/vars.yml | 26 ++++---- .../scigap/production/host_vars/toppic/vault.yml | 15 +++++ .../ansible/inventories/scigap/production/hosts | 5 +- .../scigap/staging/group_vars/django/vars.yml | 1 + dev-tools/ansible/roles/django/defaults/main.yml | 8 +++ .../django/templates/django-ssl-vhost.conf.j2 | 1 + .../roles/django/templates/django-vhost.conf.j2 | 1 + .../roles/django/templates/settings_local.py.j2 | 6 +- .../files/django-httpd.te} | 14 +++-- .../ansible/roles/django_setup/tasks/main.yml | 33 ++++++++++ dev-tools/ansible/roles/httpd/handlers/main.yml | 4 +- .../templates/email-monitor/email-config.yaml.j2 | 1 + .../task/cancel/RemoteJobCancellationTask.java | 6 +- .../helix/impl/workflow/PostWorkflowManager.java | 1 + .../core/entities/expcatalog/JobStatusEntity.java | 7 ++- 32 files changed, 190 insertions(+), 151 deletions(-) diff --cc dev-tools/ansible/roles/httpd/handlers/main.yml index f359f2d,dec326a..e5bfb0a --- a/dev-tools/ansible/roles/httpd/handlers/main.yml +++ b/dev-tools/ansible/roles/httpd/handlers/main.yml @@@ -22,5 -22,7 +22,5 @@@ # Gracefully reload httpd - name: restart httpd - service: name=httpd state=reloaded enabled=yes - become: yes + service: name={{ httpd_name[ansible_os_family] }} state=reloaded enabled=yes + become: yes - -#{{ httpd_name[ansible_os_family] }}
