diff options
| -rw-r--r-- | group_vars/ick.yml | 6 | ||||
| -rw-r--r-- | ick2.yml | 6 | ||||
| -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 |
5 files changed, 11 insertions, 11 deletions
diff --git a/group_vars/ick.yml b/group_vars/ick.yml index c039eff..7be2b27 100644 --- a/group_vars/ick.yml +++ b/group_vars/ick.yml @@ -14,8 +14,8 @@ tls_certificate: "{{ lookup('pipe', 'pass show ick2/ick.pem') }}" controller_domain: 127.0.0.1 controller_port: 12765 -blob_service_domain: 127.0.0.1 -blob_service_port: 12766 +artifact_store_domain: 127.0.0.1 +artifact_store_port: 12766 controller_url: "https://{{ controller_domain }}" -blob_service_url: "https://{{ blob_service_domain }}" +artifact_store_url: "https://{{ artifact_store_domain }}" @@ -7,14 +7,14 @@ - haproxy - ick-controller - ick-worker - - ick-blob-service + - ick-artifact-store vars: debian_codename: stretch controller_domain: 127.0.0.1 controller_port: 12765 - blob_service_domain: 127.0.0.1 - blob_service_port: 12766 + artifact_store_domain: 127.0.0.1 + artifact_store_port: 12766 controller_url: "https://{{ controller_domain }}" 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 }}" |