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 882722cd0dd4285ea82f46de1e893a812a138e56
Merge: a09ed5e 1f5066a
Author: Marcus Christie <machris...@apache.org>
AuthorDate: Mon Feb 19 15:25:54 2018 -0500
Merge branch 'ansible-standalone' of https://github.com/DImuthuUpe/airavata
into DImuthuUpe-ansible-standalone
.../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 | 12 +++-
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(+), 68 deletions(-)
--
To stop receiving notification emails like this one, please contact
machris...@apache.org.
