diff options
| author | Lars Wirzenius <lwirzenius@wikimedia.org> | 2019-07-22 17:56:27 +0300 |
|---|---|---|
| committer | Lars Wirzenius <lwirzenius@wikimedia.org> | 2019-07-22 17:56:27 +0300 |
| commit | 1f66449b19b71159e8968c3fe6b86d289731a564 (patch) | |
| tree | 10d32e9c3bbb4d9c3f0f32085b9abefd968a2095 | |
| parent | 7b37c297b58f11a854a1d3b0b00c9da73a9a2c61 (diff) | |
| download | wmf-gitlab-1f66449b19b71159e8968c3fe6b86d289731a564.tar.gz | |
Add: deployer to components.yml
Also, fix haproxy.cfg for artifact store, which has changed it's port
number over the weekend
| -rw-r--r-- | components.yml | 15 | ||||
| -rw-r--r-- | roles/haproxy/files/haproxy.cfg | 2 |
2 files changed, 15 insertions, 2 deletions
diff --git a/components.yml b/components.yml index e09671f..3ade068 100644 --- a/components.yml +++ b/components.yml @@ -7,6 +7,20 @@ hostname: testenv deployer_ssh_pub: "{{ lookup('pipe', 'pass wmf/wmf-gitlab.vm.liw.fi/deployer_ssh.pub') }}" +- hosts: deployer + remote_user: root + become: no + roles: + - haproxy + - deployer + vars: + hostname: deployer + haproxy_domain: wmf2-deployer.vm.liw.fi + letsencrypt_email: liw@liw.fi + artifact_download_token: "{{ lookup('pipe', 'pass wmf/wmf-gitlab.vm.liw.fi/artifact_download_token') }}" + deployer_ssh_pub: "{{ lookup('pipe', 'pass wmf/wmf-gitlab.vm.liw.fi/deployer_ssh.pub') }}" + deployer_ssh: "{{ lookup('pipe', 'pass wmf/wmf-gitlab.vm.liw.fi/deployer_ssh') }}" + - hosts: artifacts remote_user: root become: no @@ -37,4 +51,3 @@ haproxy_domain: wmf2-vcsworker.vm.liw.fi letsencrypt_email: liw@liw.fi - diff --git a/roles/haproxy/files/haproxy.cfg b/roles/haproxy/files/haproxy.cfg index 5c450c4..8fe9ba6 100644 --- a/roles/haproxy/files/haproxy.cfg +++ b/roles/haproxy/files/haproxy.cfg @@ -46,4 +46,4 @@ backend api server api_1 127.0.0.1:2222 backend as - server api_1 127.0.0.1:12766 + server api_1 127.0.0.1:5555 |