diff --git a/.ansible-items/inventory b/.ansible-items/inventory index 32090d7..923f281 100644 --- a/.ansible-items/inventory +++ b/.ansible-items/inventory @@ -1,2 +1,2 @@ [host] -{{ DEPLOYMENT_USER }}@{{ DEPLOY_HOSTNAME }} ansible_connection=ssh ansible_user={{ DEPLOYMENT_USER }} \ No newline at end of file +{{ DEPLOYMENT_USER }}@{{ DEPLOY_HOSTNAME }} ansible_connection=ssh ansible_user={{ DEPLOYMENT_USER }} ansible_ssh_pass={{ DEPLOYMENT_SSH_KEY_PASSPHRASE }} \ No newline at end of file diff --git a/.drone-kubernetes.yml b/.drone-kubernetes.yml index 30f802f..ca163a7 100644 --- a/.drone-kubernetes.yml +++ b/.drone-kubernetes.yml @@ -23,10 +23,13 @@ steps: from_secret: spt_items_hostname DEPLOYMENT_USER: from_secret: deploy_username + DEPLOYMENT_SSH_KEY_PASSPHRASE: + from_secret: deploy_ssh_key_passphrase commands: - sed -i 's/{{ SPT_ITEMS_HOSTNAME }}/'"$SPT_ITEMS_HOSTNAME"'/g' ./items/frontend/.env.example - mv ./items/frontend/.env.example ./items/frontend/.env - sed -i 's/{{ DEPLOY_HOSTNAME }}/'"$DEPLOY_HOSTNAME"'/g' ./.ansible-items/inventory + - sed -i 's/{{ DEPLOYMENT_SSH_KEY_PASSPHRASE }}/'"$DEPLOYMENT_SSH_KEY_PASSPHRASE"'/g' ./.ansible-items/inventory - sed -i 's/{{ DEPLOYMENT_USER }}/'"$DEPLOYMENT_USER"'/g' ./.ansible-items/inventory - name: build frontend @@ -42,7 +45,7 @@ steps: - rm ./items/api/public/index.html - name: check ansible syntax - image: shirito/drone-ansible:1.0.0 + image: plugins/ansible:3 settings: playbook: ./.ansible-items/playbook.yml inventory: ./.ansible-items/inventory @@ -53,15 +56,13 @@ steps: - development - name: apply ansible playbook - image: shirito/drone-ansible:1.0.0 + image: plugins/ansible:3 settings: playbook: ./.ansible-items/playbook.yml inventory: ./.ansible-items/inventory galaxy: ./.ansible-items/requirements.yml private_key: from_secret: deploy_ssh_key - private-key-passphrase: - from_secret: deploy_ssh_key_password environment: DEPLOY_HOSTNAME: from_secret: deploy_hostname