diff --git a/aws_confluence_dc_node.yml b/aws_confluence_dc_node.yml index f2f9a34..e33fe3d 100644 --- a/aws_confluence_dc_node.yml +++ b/aws_confluence_dc_node.yml @@ -10,9 +10,6 @@ atl_jdbc_encoding: 'UTF-8' atl_jdbc_collation: 'en_US.UTF-8' - vars_files: - - /etc/atl_vars.yml - roles: - role: linux_common - role: aws_common diff --git a/bin/ansible-with-atl-env b/bin/ansible-with-atl-env index 5c2ea21..072ff20 100755 --- a/bin/ansible-with-atl-env +++ b/bin/ansible-with-atl-env @@ -10,9 +10,6 @@ ENV_FILE=${4:-"/etc/atl"} export PATH=/usr/local/bin:$PATH -# get /etc/atl into usable vars which can be included in ansible playbooks -grep -v PASSWORD /etc/atl | sed -r -e 's/(^.+)(=)(.*$)/\L\1\E:\ \3/g' > /etc/atl_vars.yml - # Set the environment with default exports set -a source $ENV_FILE