AIRAVATA-2335 Moved pga vars -> defaults to allow overriding
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/852a4fe4 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/852a4fe4 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/852a4fe4 Branch: refs/heads/develop Commit: 852a4fe4359c6dbc9468610332cf02a2aba7ce50 Parents: 60a3223 Author: Marcus Christie <[email protected]> Authored: Wed Mar 8 10:27:19 2017 -0500 Committer: Marcus Christie <[email protected]> Committed: Wed Mar 8 10:27:19 2017 -0500 ---------------------------------------------------------------------- dev-tools/ansible/roles/pga/defaults/main.yml | 35 ++++++++++++++++++++++ dev-tools/ansible/roles/pga/vars/main.yml | 35 ---------------------- 2 files changed, 35 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/852a4fe4/dev-tools/ansible/roles/pga/defaults/main.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/roles/pga/defaults/main.yml b/dev-tools/ansible/roles/pga/defaults/main.yml new file mode 100644 index 0000000..0ea3ce1 --- /dev/null +++ b/dev-tools/ansible/roles/pga/defaults/main.yml @@ -0,0 +1,35 @@ +--- +pga_user: "pga" +pga_group: "pga" +doc_root_dir: "/var/www/html/php-gateway" +user_data_dir: "/var/www/user_data" +#httpd_conf_file: "/etc/httpd/conf/httpd.conf" +httpd_conf_file_location: + RedHat: "/etc/httpd/conf/httpd.conf" + Debian: "/etc/apache2/apache2.conf" +httpd_name: + Debian: apache2 + RedHat: httpd + +## WSO2 IS related variables +tenant_domain: "prod.testdrive" +admin_username: "tdaadmin" +admin_password: "SciDeploy" +oauth_client_key: "RuLl_Uw7i_KXaLoAGJkiasTfyBYa" +oauth_client_secret: "vD9yi2ANkChzgWiih3RahrIcfsoa" + +## Airavata Client related variables +#airavata_server: "tls://gw77.iu.xsede.org" +airavata_server: "{{ groups['api-orch'][0] }}" +airavata_port: "8930" +gateway_id: "{{ default_gateway }}" +# relative to document root dir +experiment_data_dir: "{{ user_data_dir }}" +gateway_data_store_resource_id: "js-170-103.jetstream-cloud.org_6497a464-3121-4b64-a7cb-d195b0a26c19" + +## Portal related variables +super_admin_portal: "true" +admin_emails: "'[email protected]'" +portal_email_username: "[email protected]" +portal_email_password: "airavata12" +... http://git-wip-us.apache.org/repos/asf/airavata/blob/852a4fe4/dev-tools/ansible/roles/pga/vars/main.yml ---------------------------------------------------------------------- diff --git a/dev-tools/ansible/roles/pga/vars/main.yml b/dev-tools/ansible/roles/pga/vars/main.yml deleted file mode 100644 index a47212d..0000000 --- a/dev-tools/ansible/roles/pga/vars/main.yml +++ /dev/null @@ -1,35 +0,0 @@ ---- -pga_user: "pga" -pga_group: "pga" -doc_root_dir: "/var/www/html/php-gateway" -user_data_dir: "/var/www/user_data" -#httpd_conf_file: "/etc/httpd/conf/httpd.conf" -httpd_conf_file_location: - RedHat: "/etc/httpd/conf/httpd.conf" - Debian: "/etc/apache2/apache2.conf" -httpd_name: - Debian: apache2 - RedHat: httpd - -## WSO2 IS related variables -tenant_domain: "prod.testdrive" -admin_username: "tdaadmin" -admin_password: "SciDeploy" -oauth_client_key: "RuLl_Uw7i_KXaLoAGJkiasTfyBYa" -oauth_client_secret: "vD9yi2ANkChzgWiih3RahrIcfsoa" - -## Airavata Client related variables -#airavata_server: "tls://gw77.iu.xsede.org" -airavata_server: "{{ groups['api-orch'][0] }}" -airavata_port: "8930" -gateway_id: "{{ default_gateway }}" -# relative to document root dir -experiment_data_dir: "{{ user_data_dir }}" -gateway_data_store_resource_id: "js-170-103.jetstream-cloud.org_6497a464-3121-4b64-a7cb-d195b0a26c19" - -## Portal related variables -super_admin_portal: "true" -admin_emails: "'[email protected]'" -portal_email_username: "[email protected]" -portal_email_password: "airavata12" -...
