diff --git a/.ansible-items/inventory b/.ansible-items/inventory index 923f281..06eccd1 100644 --- a/.ansible-items/inventory +++ b/.ansible-items/inventory @@ -1,2 +1,8 @@ -[host] -{{ DEPLOYMENT_USER }}@{{ DEPLOY_HOSTNAME }} ansible_connection=ssh ansible_user={{ DEPLOYMENT_USER }} ansible_ssh_pass={{ DEPLOYMENT_SSH_KEY_PASSPHRASE }} \ No newline at end of file +all: + children: + host: + ansible_host: {{ DEPLOY_HOSTNAME }} + ansible_user: {{ DEPLOYMENT_USER }} + ansible_connection: ssh + ansible_ssh_private_key_file: private.key + ansible_ssh_pass: {{ DEPLOYMENT_SSH_KEY_PASSPHRASE }} \ No newline at end of file diff --git a/.drone-kubernetes.yml b/.drone-kubernetes.yml index ca163a7..05aaca6 100644 --- a/.drone-kubernetes.yml +++ b/.drone-kubernetes.yml @@ -25,12 +25,15 @@ steps: from_secret: deploy_username DEPLOYMENT_SSH_KEY_PASSPHRASE: from_secret: deploy_ssh_key_passphrase + PRIVATE_KEY: + from_secret: deploy_ssh_key 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 + - sed -i 's/{{ SPT_ITEMS_HOSTNAME }}/'"$SPT_ITEMS_HOSTNAME"'/g' ./items/frontend/.env.example + - mv ./items/frontend/.env.example ./items/frontend/.env + - echo "{{ PRIVATE_KEY }}" > private.key + - 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 image: node:lts-alpine3.14 @@ -61,8 +64,6 @@ steps: playbook: ./.ansible-items/playbook.yml inventory: ./.ansible-items/inventory galaxy: ./.ansible-items/requirements.yml - private_key: - from_secret: deploy_ssh_key environment: DEPLOY_HOSTNAME: from_secret: deploy_hostname