Skip to content

Commit

Permalink
Merge pull request #15 from iqoption/ansible-version
Browse files Browse the repository at this point in the history
Check ansible install from pip
  • Loading branch information
arslanbekov authored Jan 25, 2018
2 parents 0c5a60a + 8fa50ae commit 2b8de10
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 43 deletions.
5 changes: 2 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
language: python
python: "2.7"
sudo: required
group: deprecated-2017Q4
dist: trusty
services:
- docker
Expand All @@ -12,9 +13,7 @@ before_install:
install:
- sudo pip install docker-py
- sudo apt-get install -y sshpass software-properties-common python-software-properties
- sudo apt-add-repository -y ppa:ansible/ansible
- sudo apt-get update -qq
- sudo apt-get install -y ansible
- sudo pip install ansible
- echo -e 'localhost ansible_connection=local' > tests/inventory
- echo -e '[defaults]\nroles_path = ../\nhostfile = ./tests/inventory' > ansible.cfg
- sudo rm /usr/bin/python && sudo ln -s /usr/bin/python2.7 /usr/bin/python
Expand Down
66 changes: 32 additions & 34 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,11 @@ grid_router_docker_api_version: 1.24 # Docker api version (for GridRouter)
grid_router_host_list: group # Host list for selenoid.xml

grid_router_regions: # Hosts list per region
- name: "region-1"
hosts:
- name: localhost
port: 4444
browser_count: 4

- name: "region-1"
hosts:
- name: localhost
port: 4444
browser_count: 4

grid_router_browsers: # Browser list usage selenoid
- name: "firefox"
Expand All @@ -56,18 +55,18 @@ You can override collection browsers `grid_router_browsers` according to your ne
For example:
```yaml
grid_router_browsers:
- name: "firefox"
defaultVersion: "54.0"
versions:
- "54.0"
- name: "chrome"
defaultVersion: "59.0"
versions:
- "59.0"
- name: "opera"
defaultVersion: "45.0"
versions:
- "45.0"
- name: "firefox"
defaultVersion: "54.0"
versions:
- "54.0"
- name: "chrome"
defaultVersion: "59.0"
versions:
- "59.0"
- name: "opera"
defaultVersion: "45.0"
versions:
- "45.0"
```

All supported browsers see [here](https://github.com/aerokube/selenoid#ready-to-use-browser-images).
Expand All @@ -83,29 +82,28 @@ Ggr is [using](http://aerokube.com/ggr/latest/#_creating_users_file) htpasswd fi
grid_router_path: "{{ ansible_env.HOME }}/grid-router"
grid_router_qouta_path: "{{ ansible_env.HOME }}/grid-router/quota"
grid_router_port: 4445
grid_router_regions:
- name: "region-1"
hosts:
- name: 192.168.1.1
port: 4444
browser_count: 4
- name: 192.168.1.2
port: 4445
browser_count: 4
- name: "region-1"
hosts:
- name: 192.168.1.1
port: 4444
browser_count: 4
- name: 192.168.1.2
port: 4445
browser_count: 4
grid_router_browsers:
- name: "chrome"
defaultVersion: "62.0"
versions:
- "62.0"
- "63.0"
- name: "chrome"
defaultVersion: "62.0"
versions:
- "62.0"
- "63.0"
roles:
- gridrouter-docker
```

## Dependencies

None

## Contributing
Expand Down
10 changes: 5 additions & 5 deletions defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ grid_router_docker_api_version: 1.24 # Docker api version (for GridRouter)
grid_router_host_list: group # Host list for selenoid.xml

grid_router_regions: # Hosts list per region
- name: "region-1"
hosts:
- name: localhost
port: 4444
browser_count: 4
- name: "region-1"
hosts:
- name: localhost
port: 4444
browser_count: 4

grid_router_browsers: # Browser list usage selenoid
- name: "firefox"
Expand Down
2 changes: 1 addition & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ galaxy_info:
description: |
Ansible role to manage and run the gridrouter docker container.
company: Iqoption Ltd.
min_ansible_version: 2.1
min_ansible_version: 2.2
platforms:
- name: Ubuntu
versions:
Expand Down

0 comments on commit 2b8de10

Please sign in to comment.