Commit 7bb645cf by John Jarvis

adding secure_vars_file

parent 962e2977
...@@ -220,6 +220,7 @@ git_repo_secure="{configuration_secure_repo}" ...@@ -220,6 +220,7 @@ git_repo_secure="{configuration_secure_repo}"
git_repo_secure_name="{configuration_secure_repo_basename}" git_repo_secure_name="{configuration_secure_repo_basename}"
git_repo_private="{configuration_private_repo}" git_repo_private="{configuration_private_repo}"
git_repo_private_name=$(basename $git_repo_private .git) git_repo_private_name=$(basename $git_repo_private .git)
secure_vars_file={secure_vars_file}
environment_deployment_secure_vars="$base_dir/$git_repo_secure_name/ansible/vars/{environment}-{deployment}.yml" environment_deployment_secure_vars="$base_dir/$git_repo_secure_name/ansible/vars/{environment}-{deployment}.yml"
deployment_secure_vars="$base_dir/$git_repo_secure_name/ansible/vars/{deployment}.yml" deployment_secure_vars="$base_dir/$git_repo_secure_name/ansible/vars/{deployment}.yml"
instance_id=\\ instance_id=\\
...@@ -327,8 +328,8 @@ if [[ -r "$environment_deployment_secure_vars" ]]; then ...@@ -327,8 +328,8 @@ if [[ -r "$environment_deployment_secure_vars" ]]; then
extra_args_opts+=" -e@$environment_deployment_secure_vars" extra_args_opts+=" -e@$environment_deployment_secure_vars"
fi fi
if $secure_vars; then if $secure_vars_file; then
extra_args_opts+=" -e@$secure_vars" extra_args_opts+=" -e@$secure_vars_file"
fi fi
extra_args_opts+=" -e@$extra_vars" extra_args_opts+=" -e@$extra_vars"
...@@ -355,7 +356,7 @@ rm -rf $base_dir ...@@ -355,7 +356,7 @@ rm -rf $base_dir
queue_name=run_id, queue_name=run_id,
extra_vars_yml=extra_vars_yml, extra_vars_yml=extra_vars_yml,
git_refs_yml=git_refs_yml, git_refs_yml=git_refs_yml,
secure_vars=secure_vars, secure_vars_file=secure_vars_file,
cache_id=args.cache_id) cache_id=args.cache_id)
mapping = BlockDeviceMapping() mapping = BlockDeviceMapping()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment