Skip to content

Commit a09f371

Browse files
committed
chore: decommission of Vagrant
infra/vagrant/ => infra/ansible/ infra/vagrant/requirements.yml => infra/ansible/requirements.galaxy.yml infra/vagrant/provisioning/vagrant.yml => infra/ansible/playbook.yml infra/vagrant/provisioning/* => infra/ansible/ Fix #1599 [skip ci]
1 parent 3c7caa5 commit a09f371

File tree

30 files changed

+18
-79
lines changed

30 files changed

+18
-79
lines changed

.github/workflows/provision-by-ansible.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ jobs:
3838
run: ansible --version
3939

4040
- name: Decrypt ansible files
41-
working-directory: infra/vagrant
41+
working-directory: infra/ansible
4242
env:
4343
# https://docs.github.com/en/actions/security-guides/encrypted-secrets#using-encrypted-secrets-in-a-workflow
4444
VAULT_PASSWORD: ${{ secrets.VAULT_PASSWORD }}
4545
run: |
4646
printf '%s' "$VAULT_PASSWORD" >vault-pass.txt
4747
48-
for FILENAME in provisioning/vars/prod.yml provisioning/coder_rsa; do
48+
for FILENAME in vars/prod.yml coder_rsa; do
4949
echo "Decrypting ${FILENAME}.enc to $FILENAME"
5050
ansible-vault decrypt \
5151
--vault-password-file vault-pass.txt \
@@ -54,27 +54,27 @@ jobs:
5454
done
5555
5656
- name: Install required collections
57-
working-directory: infra/vagrant
58-
run: ansible-galaxy role install --role-file requirements.yml --roles-path provisioning/roles
57+
working-directory: infra/ansible
58+
run: ansible-galaxy role install --role-file requirements.galaxy.yml --roles-path roles
5959

6060
- name: Run ansible in syntax check mode
61-
working-directory: infra/vagrant
62-
run: ansible-playbook provisioning/prod.yml -i provisioning/prod.inventory --syntax-check
61+
working-directory: infra/ansible
62+
run: ansible-playbook prod.yml -i prod.inventory --syntax-check
6363

6464
- name: Run ansible
65-
working-directory: infra/vagrant
65+
working-directory: infra/ansible
6666
env:
6767
# Disable host key checking to suppress interactive prompt.
6868
# See: https://docs.ansible.com/ansible/2.10/user_guide/connection_details.html#managing-host-key-checking
6969
ANSIBLE_HOST_KEY_CHECKING: 'False'
7070
# See: https://docs.ansible.com/ansible/2.10/reference_appendices/config.html#envvar-ANSIBLE_PRIVATE_KEY_FILE
71-
ANSIBLE_PRIVATE_KEY_FILE: 'provisioning/coder_rsa'
72-
run: ansible-playbook provisioning/prod.yml -i provisioning/prod.inventory
71+
ANSIBLE_PRIVATE_KEY_FILE: 'coder_rsa'
72+
run: ansible-playbook prod.yml -i prod.inventory
7373

7474
- name: Cleanup
7575
if: always()
76-
working-directory: infra/vagrant
76+
working-directory: infra/ansible
7777
run: |
78-
for FILE in vault-pass.txt provisioning/vars/prod.yml provisioning/coder_rsa; do
78+
for FILE in vault-pass.txt vars/prod.yml coder_rsa; do
7979
[ ! -f "$FILE" ] || rm -fv "$FILE"
8080
done

.gitignore

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@ src/main/javascript/*/*.min.js
1818
src/main/frontend/node/
1919
src/main/frontend/node_modules/
2020

21-
# Vagrant related files
22-
.vagrant/
23-
infra/vagrant/provisioning/vagrant.retry
24-
infra/vagrant/provisioning/vars/prod.yml
25-
infra/vagrant/provisioning/roles/php-coder.oraclejdk/
26-
infra/vagrant/provisioning/roles/php-coder.nginx/
27-
infra/vagrant/provisioning/roles/mystamps-nginx/files/prod/my-stamps.ru.key
28-
infra/vagrant/provisioning/roles/mystamps-nginx/files/prod/my-stamps.ru.crt
21+
# Ansible related files
22+
infra/ansible/vars/prod.yml
23+
infra/ansible/roles/php-coder.oraclejdk/
24+
infra/ansible/roles/php-coder.nginx/
25+
infra/ansible/roles/mystamps-nginx/files/prod/my-stamps.ru.key
26+
infra/ansible/roles/mystamps-nginx/files/prod/my-stamps.ru.crt
2927

3028
# Terraform related files
3129
infra/terraform/.terraform/

NEWS.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
0.x (upcoming release)
22
- (infrastructure) migrate to Spring Boot 2.3
3+
- (infrastructure) discontinue usage of Vagrant
34

45
0.4.7
56
- (infrastructure) port JavaScript unit tests from Jasmine to Jest
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 commit comments

Comments
 (0)