diff options
| author | Lars Wirzenius <liw@liw.fi> | 2018-03-25 15:53:58 +0300 |
|---|---|---|
| committer | Lars Wirzenius <liw@liw.fi> | 2018-03-25 15:53:58 +0300 |
| commit | 0b38302e0f1bec91ad8556b806355ebe104296a3 (patch) | |
| tree | d1cd47b410903e7b27c901c4e523eb952693ac16 /roles | |
| parent | 303278daa3480f459d3f076c3f5a8793c94fa8b1 (diff) | |
| download | ick2-ansible-0b38302e0f1bec91ad8556b806355ebe104296a3.tar.gz | |
Change: adapt to blob service now being the artifact store
Diffstat (limited to 'roles')
| -rw-r--r-- | roles/haproxy/templates/haproxy.cfg.j2 | 6 | ||||
| -rw-r--r-- | roles/ick-artifact-store/templates/artifact_store.yaml.j2 | 2 | ||||
| -rw-r--r-- | roles/ick-controller/templates/controller.yaml.j2 | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/roles/haproxy/templates/haproxy.cfg.j2 b/roles/haproxy/templates/haproxy.cfg.j2 index b5eab39..65a3b19 100644 --- a/roles/haproxy/templates/haproxy.cfg.j2 +++ b/roles/haproxy/templates/haproxy.cfg.j2 @@ -39,11 +39,11 @@ frontend http-in acl blobs path_beg /blobs acl any method GET HEAD POST PUT DELETE - use_backend blob_service if blobs + use_backend artifact_store if blobs use_backend controller if any backend controller server controller_1 127.0.0.1:{{ controller_port }} -backend blob_service - server blob_service_1 127.0.0.1:{{ blob_service_port }} +backend artifact_store + server artifact_store_1 127.0.0.1:{{ artifact_store_port }} diff --git a/roles/ick-artifact-store/templates/artifact_store.yaml.j2 b/roles/ick-artifact-store/templates/artifact_store.yaml.j2 index 0708da5..4db479b 100644 --- a/roles/ick-artifact-store/templates/artifact_store.yaml.j2 +++ b/roles/ick-artifact-store/templates/artifact_store.yaml.j2 @@ -2,5 +2,5 @@ token-issuer: localhost token-audience: localhost token-public-key: "{{ token_public_key }}" log: - - filename: /var/log/ickbs/blob_service.log + - filename: /var/log/ickas/artifact_store.log blobdir: /var/lib/ick/blobs diff --git a/roles/ick-controller/templates/controller.yaml.j2 b/roles/ick-controller/templates/controller.yaml.j2 index 727a04b..4594fe1 100644 --- a/roles/ick-controller/templates/controller.yaml.j2 +++ b/roles/ick-controller/templates/controller.yaml.j2 @@ -1,4 +1,4 @@ -blob-service: "{{ blob_service_url }}" +artifact-store: "{{ artifact_store_url }}" token-issuer: localhost token-audience: localhost token-public-key: "{{ token_public_key }}" |