From 61dad05c63060b130c46077e8433116b00902233 Mon Sep 17 00:00:00 2001 From: Arslanbekov Denis Date: Tue, 16 Jan 2018 16:29:09 +0300 Subject: [PATCH 1/2] Add docker_api_version, add TZ support, add new variables in README.md --- README.md | 1 + defaults/main.yml | 1 + tasks/main.yml | 5 ++++- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b245732..eed6eff 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,7 @@ Set up [GridRouter](https://github.com/aerokube/ggr) in docker * `grid_router_qouta_password`: [Default: `selenoid`] GridRouter quota password * `grid_router_qouta_user`: [Default: `selenoid`] GridRouter quota user * `grid_router_gr_path`: [Default: `/etc/grid-router`] Path to GridRouter +* `grid_router_port`: [Default: `4444`] GridRouter port * `grid_router_docker_api_version`: [Default: `1.24`] Docker api version (for GridRouter) * `grid_router_host_list`: [Default: `group1`] * `grid_router_region`: [Default: `region1`] diff --git a/defaults/main.yml b/defaults/main.yml index 56d7f1c..c88600a 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -4,6 +4,7 @@ grid_router_qouta_path: /etc/grid-router/quota grid_router_qouta_password: selenoid grid_router_qouta_user: selenoid grid_router_gr_path: /etc/grid-router +grid_router_port: 4444 grid_router_docker_api_version: 1.24 grid_router_host_list: group1 grid_router_region: region1 diff --git a/tasks/main.yml b/tasks/main.yml index 4307055..e781e0e 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -45,5 +45,8 @@ state: started volumes: - "{{ grid_router_gr_path }}:{{ grid_router_gr_path }}:ro" + env: + TZ: "{{ selenoid_time_zone }}" + DOCKER_API_VERSION: "{{ grid_router_docker_api_version }}" ports: - - "4444:4444" + - "{{ grid_router_port }}:{{ grid_router_port }}" From e5596ae67e25ffed017bbc5307a0565871f541cb Mon Sep 17 00:00:00 2001 From: Arslanbekov Denis Date: Tue, 16 Jan 2018 16:33:07 +0300 Subject: [PATCH 2/2] Add valid variable timezone_in_container --- README.md | 1 + defaults/main.yml | 1 + tasks/main.yml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index eed6eff..1045f69 100644 --- a/README.md +++ b/README.md @@ -20,6 +20,7 @@ Set up [GridRouter](https://github.com/aerokube/ggr) in docker * `grid_router_host_list`: [Default: `group1`] * `grid_router_region`: [Default: `region1`] * `grid_router_host_name`: [Default: `selenoid[1:10].example.com`] Hostname selenoid +* `grid_router_time_zone`: [Default: `Europe/Moscow`] Timezone in container Ggr is [using](http://aerokube.com/ggr/latest/#_creating_users_file) htpasswd files to store authentication data. Passwords are stored in encrypted form. diff --git a/defaults/main.yml b/defaults/main.yml index c88600a..ba51c26 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -9,3 +9,4 @@ grid_router_docker_api_version: 1.24 grid_router_host_list: group1 grid_router_region: region1 grid_router_host_name: selenoid[1:10].example.com +grid_router_time_zone: Europe/Moscow diff --git a/tasks/main.yml b/tasks/main.yml index e781e0e..282b67c 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -46,7 +46,7 @@ volumes: - "{{ grid_router_gr_path }}:{{ grid_router_gr_path }}:ro" env: - TZ: "{{ selenoid_time_zone }}" + TZ: "{{ grid_router_time_zone }}" DOCKER_API_VERSION: "{{ grid_router_docker_api_version }}" ports: - "{{ grid_router_port }}:{{ grid_router_port }}"