diff --git a/Jenkinsfile-v1 b/Jenkinsfile-v1 index 82bda74..c9168df 100644 --- a/Jenkinsfile-v1 +++ b/Jenkinsfile-v1 @@ -42,10 +42,8 @@ pipeline { // set AWS credentials sshScript remote: remote, script: "ansible/prepare-server.sh" - sshCommand remote: remote, command: 'export AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID' - sshCommand remote: remote, command: 'export AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY' - sshCommand remote: remote, command: "ansible-playbook docker-and-compose.yaml" + sshCommand remote: remote, command: "export AWS_ACCESS_KEY_ID=${AWS_ACCESS_KEY_ID}; export AWS_SECRET_ACCESS_KEY=${AWS_SECRET_ACCESS_KEY}; ansible-playbook docker-and-compose.yaml" } } } diff --git a/ansible/inventory_aws_ec2.yaml b/ansible/inventory_aws_ec2.yaml index 08c818d..5832a41 100644 --- a/ansible/inventory_aws_ec2.yaml +++ b/ansible/inventory_aws_ec2.yaml @@ -1,6 +1,5 @@ --- plugin: aws_ec2 -# boto_profile: default regions: - eu-west-3 keyed_groups: