[airavata] branch staging updated: Move default gateway_data_store_ssh_public_key var

[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 3c3e7e9  Move default gateway_data_store_ssh_public_key var
3c3e7e9 is described below

commit 3c3e7e9bbc87d295c99aa78865693cc42ef66a32
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Mon Oct 7 14:03:23 2019 -0400

    Move default gateway_data_store_ssh_public_key var
---
 dev-tools/ansible/roles/django/defaults/main.yml | 1 +
 dev-tools/ansible/roles/httpd/defaults/main.yml  | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/dev-tools/ansible/roles/django/defaults/main.yml b/dev-tools/ansible/roles/django/defaults/main.yml
index 32a9b6d..1629b95 100644
--- a/dev-tools/ansible/roles/django/defaults/main.yml
+++ b/dev-tools/ansible/roles/django/defaults/main.yml
@@ -75,6 +75,7 @@ gateway_id: "{{ default_gateway }}"
 # relative to document root dir
 experiment_data_dir: "{{ user_data_dir }}"
 file_upload_tmp_dir: "{{ experiment_data_dir }}/tmp/"
+gateway_data_store_ssh_public_key: ""
 gateway_data_store_resource_id: "js-170-103.jetstream-cloud.org_6497a464-3121-4b64-a7cb-d195b0a26c19"
 gateway_data_store_hostname: "{{ groups['django'][0] }}"
 portal_email_tls: false
diff --git a/dev-tools/ansible/roles/httpd/defaults/main.yml b/dev-tools/ansible/roles/httpd/defaults/main.yml
index 77b94ad..f1f7588 100644
--- a/dev-tools/ansible/roles/httpd/defaults/main.yml
+++ b/dev-tools/ansible/roles/httpd/defaults/main.yml
@@ -30,8 +30,6 @@ httpd_ssl_conf_file_location:
 httpd_default_conf_template: "default.conf.j2"
 httpd_ssl_conf_template: "ssl.conf.j2"
 
-gateway_data_store_ssh_public_key: ""
-
 httpd_default_http_port: 80
 httpd_default_https_port: 443
 ...