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 37b06e241cf361b36f6081386ac4eb9dacc7a56f Merge: 86a2908 882722c Author: Marcus Christie <machris...@apache.org> AuthorDate: Mon Feb 19 15:29:14 2018 -0500 Merge branch 'DImuthuUpe-ansible-standalone' into develop .../api/server/handler/AiravataServerHandler.java | 55 +++++++++++++++++ .../group_vars/all/vars.yml | 63 +++++++++++-------- .../inventories/standalone/group_vars/pga/vars.yml | 70 ++++++++++++++++++++++ dev-tools/ansible/inventories/standalone/hosts | 24 ++++++++ .../inventories/template/group_vars/all/vars.yml | 11 +++- dev-tools/ansible/roles/api-orch/defaults/main.yml | 13 +++- dev-tools/ansible/roles/api-orch/tasks/main.yml | 12 ++-- .../templates/airavata-server.properties.j2 | 6 +- dev-tools/ansible/roles/common/tasks/main.yml | 4 +- .../ansible/roles/database/tasks/keycloak.yml | 2 +- dev-tools/ansible/roles/database/tasks/main.yml | 2 +- dev-tools/ansible/roles/env_setup/tasks/main.yml | 4 ++ dev-tools/ansible/roles/gfac/defaults/main.yml | 5 +- .../gfac/templates/airavata-server.properties.j2 | 6 +- dev-tools/ansible/roles/pga/defaults/main.yml | 11 +++- dev-tools/ansible/roles/pga/tasks/main.yml | 16 ++++- .../default.conf => templates/default.conf.j2} | 3 +- .../roles/pga/templates/pga-ssl-vhost.conf.j2 | 4 +- .../ansible/roles/pga/templates/pga-vhost.conf.j2 | 2 +- .../pga/{files/ssl.conf => templates/ssl.conf.j2} | 4 +- dev-tools/ansible/roles/rabbitmq/tasks/main.yml | 8 +-- .../templates/airavata-server.properties.j2 | 2 +- dev-tools/ansible/roles/zookeeper/vars/main.yml | 2 +- .../roles/zookeeper/vars/main.yml | 2 +- .../credential-store-service/pom.xml | 5 ++ .../store/impl/util/CredentialStoreInitUtil.java | 7 +++ .../registry-server/registry-api-service/pom.xml | 2 +- 27 files changed, 276 insertions(+), 69 deletions(-) diff --cc dev-tools/ansible/roles/api-orch/defaults/main.yml index 8a8b884,be00047..c73f4cb --- a/dev-tools/ansible/roles/api-orch/defaults/main.yml +++ b/dev-tools/ansible/roles/api-orch/defaults/main.yml @@@ -30,6 -28,14 +30,15 @@@ iam_server_super_admin_username: "admin profile_service_host: "localhost" profile_service_port: 8962 - mariadb_connector_jar_url: "https://downloads.mariadb.com/Connectors/java/connector-java-2.0.2/mariadb-java-client-2.0.2.jar" - + mariadb_connector_jar_url: "http://downloads.mariadb.com/Connectors/java/connector-java-2.0.2/mariadb-java-client-2.0.2.jar" +sharing_registry_tls_enabled: "false" + + api_server_bind_host: "{{ ansible_default_ipv4.address }}" + orchestrator_bind_host: "{{ ansible_default_ipv4.address }}" + cred_store_server_bind_host: "{{ ansible_default_ipv4.address }}" + registry_bind_host: "{{ ansible_default_ipv4.address }}" + sharing_registry_bind_host: "{{ ansible_default_ipv4.address }}" + profile_service_bind_host: "{{ ansible_default_ipv4.address }}" + + default_registry_user : "admin" -default_registry_password : "admin" ++default_registry_password : "admin" diff --cc dev-tools/ansible/roles/gfac/defaults/main.yml index 8331672,bd0cc13..1d97bcd --- a/dev-tools/ansible/roles/gfac/defaults/main.yml +++ b/dev-tools/ansible/roles/gfac/defaults/main.yml @@@ -19,6 -19,7 +19,9 @@@ # gfac_log_dir: "{{ gfac_dir }}/{{ airavata_dist }}/logs" +gfac_log_max_history: 30 +gfac_log_total_size_cap: "1GB" - mariadb_connector_jar_url: "https://downloads.mariadb.com/Connectors/java/connector-java-2.0.2/mariadb-java-client-2.0.2.jar" + mariadb_connector_jar_url: "http://downloads.mariadb.com/Connectors/java/connector-java-2.0.2/mariadb-java-client-2.0.2.jar" + + default_registry_user : "admin" -default_registry_password : "admin" ++default_registry_password : "admin" -- To stop receiving notification emails like this one, please contact machris...@apache.org.