diff --git a/README.md b/README.md index fb66719..4ecabb7 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ grid_router_host_list: group # Host list for selenoid.xml grid_router_regions: # Hosts list per region - name: "region-1" hosts: - - name: localhost + - name: localhost[01:10].site.com # You can usage pattern [01:N] port: 4444 browser_count: 5 @@ -35,12 +35,16 @@ grid_router_browsers: # Browser list usage selenoid - "59.0" - "58.0" - "57.0" + - "56.0" + - "55.0" - name: "chrome" defaultVersion: "65.0" versions: - "65.0" - "64.0" - "63.0" + - "62.0" + - "61.0" - name: "opera" defaultVersion: "52.0" versions: @@ -69,8 +73,6 @@ grid_router_browsers: All supported browsers see [here](https://github.com/aerokube/selenoid#ready-to-use-browser-images). -Ggr is [using](http://aerokube.com/ggr/latest/#_creating_users_file) htpasswd files to store authentication data. Passwords are stored in encrypted form. - #### Example ```yaml @@ -84,19 +86,18 @@ Ggr is [using](http://aerokube.com/ggr/latest/#_creating_users_file) htpasswd fi grid_router_regions: - name: "region-1" hosts: - - name: 192.168.1.1 + - name: 192.168.1.[1:2] port: 4444 browser_count: 4 - - name: 192.168.1.2 - port: 4445 - browser_count: 4 grid_router_browsers: - name: "chrome" - defaultVersion: "62.0" + defaultVersion: "65.0" versions: - - "62.0" + - "65.0" + - "64.0" - "63.0" + - "62.0" roles: - gridrouter-docker ``` diff --git a/tasks/main.yml b/tasks/main.yml index 58f00a3..4721cad 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -10,6 +10,7 @@ url: "https://github.com/seleniumkit/sctl/releases/download/{{ grid_router_sctl_version }}/sctl_linux_amd64" dest: /usr/local/bin/sctl mode: 0755 + force: yes changed_when: False - name: Grid Router | Create config dir @@ -40,4 +41,4 @@ TZ: "{{ grid_router_time_zone }}" ports: - "{{ grid_router_port }}:{{ grid_router_port }}" - command: ["/usr/bin/ggr", "-listen", ":4444", "-quotaDir", "{{ grid_router_qouta_path }}", "-guests-allowed", "-guest-quota", "{{ grid_router_qouta_user }}"] + entrypoint: ["/usr/bin/ggr", "-listen", ":4444", "-quotaDir", "{{ grid_router_qouta_path }}", "-guests-allowed", "-guests-quota", "{{ grid_router_qouta_user }}"]