diff options
| author | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2018-01-16 13:53:11 -0700 |
|---|---|---|
| committer | Carlos Konstanski <ckonstanski@pippiandcarlos.com> | 2018-01-16 13:53:11 -0700 |
| commit | e528c2560c0c5764d3e49bff569dab9a863b0b55 (patch) | |
| tree | 1a7925a6d123c7c95da53934c8225b7a0b934b6e /salt/openbook/ansible/files | |
| parent | a392d817352de0ea6c84ca0c2023ad1506830486 (diff) | |
Openbook CI: make new self-signed cert for CI/CD stack
Issue: IS-56
Diffstat (limited to 'salt/openbook/ansible/files')
| -rw-r--r-- | salt/openbook/ansible/files/registry.conf | 4 | ||||
| -rw-r--r-- | salt/openbook/ansible/files/ssl.yaml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/salt/openbook/ansible/files/registry.conf b/salt/openbook/ansible/files/registry.conf index 70ebf7e..04edb64 100644 --- a/salt/openbook/ansible/files/registry.conf +++ b/salt/openbook/ansible/files/registry.conf @@ -1,4 +1,4 @@ -upstream docker-registry { +upstream {% raw %}{{ inventory_hostsname }}{% endraw %} { server registry:5000; } @@ -29,7 +29,7 @@ server { auth_basic_user_file /etc/nginx/conf.d/registry.password; add_header 'Docker-Distribution-Api-Version' 'registry/2.0' always; - proxy_pass http://docker-registry; + proxy_pass http://{% raw %}{{ inventory_hostsname }}{% endraw %}; proxy_set_header Host $http_host; # required for docker client's sake proxy_set_header X-Real-IP $remote_addr; # pass on real client's IP proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/salt/openbook/ansible/files/ssl.yaml b/salt/openbook/ansible/files/ssl.yaml index 6330e87..fad5563 100644 --- a/salt/openbook/ansible/files/ssl.yaml +++ b/salt/openbook/ansible/files/ssl.yaml @@ -20,5 +20,5 @@ chown root:ssl-cert "/etc/ssl/private/{{ item }}.key" fi executable: /bin/bash - with_items: - - "{{ inventory_hostname }}" + with_items: + - "{{ inventory_hostname }}" |