[airavata] branch staging updated: django_extra_settiings converts yaml data to arbitrary json

[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


The following commit(s) were added to refs/heads/staging by this push:
     new eb39d24  django_extra_settiings converts yaml data to arbitrary json
eb39d24 is described below

commit eb39d24eee19de930ea4ab0cbf20055c7678ff8c
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Oct 2 10:38:14 2019 -0400

    django_extra_settiings converts yaml data to arbitrary json
---
 dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml | 2 ++
 dev-tools/ansible/inventories/scigap/staging/host_vars/simccs/vars.yml | 2 ++
 dev-tools/ansible/roles/django/templates/settings_local.py.j2          | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml
index 9619d55..049da8a 100644
--- a/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/develop/host_vars/simccs/vars.yml
@@ -50,6 +50,8 @@ auth_options:
 
 django_extra_settings:
   JAVA_HOME: "/usr/java/default"
+  MAPTOOL_SETTINGS:
+    CPLEX_APPLICATION_ID: "Cplex_a7eaf483-ab92-4441-baeb-2f302ccb2919"
 
 gateway_id: "simccs"
 experiment_data_dir: "{{ user_data_dir }}/django-simccs"
diff --git a/dev-tools/ansible/inventories/scigap/staging/host_vars/simccs/vars.yml b/dev-tools/ansible/inventories/scigap/staging/host_vars/simccs/vars.yml
index c4fc58a..bbce661 100644
--- a/dev-tools/ansible/inventories/scigap/staging/host_vars/simccs/vars.yml
+++ b/dev-tools/ansible/inventories/scigap/staging/host_vars/simccs/vars.yml
@@ -30,6 +30,8 @@ airavata_django_extra_dependencies:
 
 django_extra_settings:
   JAVA_HOME: "/usr/java/default"
+  MAPTOOL_SETTINGS:
+    CPLEX_APPLICATION_ID: "cplex-solver_99721933-c9e4-4285-9ef1-d035ca82b541"
 
 vhost_servername: "django.simccs.scigap.org"
 vhost_ssl: true
diff --git a/dev-tools/ansible/roles/django/templates/settings_local.py.j2 b/dev-tools/ansible/roles/django/templates/settings_local.py.j2
index 1cf52eb..eeb17e5 100644
--- a/dev-tools/ansible/roles/django/templates/settings_local.py.j2
+++ b/dev-tools/ansible/roles/django/templates/settings_local.py.j2
@@ -149,5 +149,5 @@ FILE_UPLOAD_MAX_FILE_SIZE = {{ django_file_upload_max_file_size_mb }} * 1024 * 1
 
 # Extra settings
 {% for extra_setting in django_extra_settings.items() | list %}
-{{ extra_setting[0] }} = '{{ extra_setting[1] }}'
+{{ extra_setting[0] }} = {{ extra_setting[1] | to_nice_json }}
 {% endfor %}