Commit eeeaa56d96e653f913237867e82ce4adb6abc118

Authored by Alexandre Chapellon
1 parent 83c4aa31fb
Exists in master and in 1 other branch rheltarget

move config.yml to group_vars/all as it break variable precedence

1 1 index 86411b46fba2d1709315c3d9f78c565c4c229c36..cc53054e3d73da89d716d091a59ac98d8d60da72 100644
2   --- a/config.yml
  2 +++ b/group_vars/all
... ... @@ -36,7 +36,7 @@ java_version: "{{ java_ver | default(8) }}"
36 36 java_flavor: "{{ java_flav | default('openjdk') }}"
37 37 tomcat_version: "{{ tomcat_ver | default(7) }}"
38 38 tomcat_clean: "{{ tomcat_cln | default(False) }}"
39   -#tomcat_port: "{{ tomcat_prt | default(8080) }}"
  39 +tomcat_port: "{{ tomcat_prt | default(8080) }}"
40 40  
41 41 selenium_version: "{{ selenium_ver | default('2.53.0') }}"
42 42 selenium_release: "{{ selenium_version | regex_replace('\\.\\d+$','') }}"
... ...
host_vars/rhalfbmsrv
1 1 ---
2 2 - hosts: all
3   - vars_files:
4   - - ../config.yml
5 3 roles:
6 4 - common
... ...
yml/bm-server.yml
1 1 ---
2 2 - hosts: bm-server
3   - vars_files:
4   - - ../config.yml
5 3 roles:
6 4 - tomcat
7 5 - bm-server
... ...
yml/load-driver.yml
1 1 ---
2 2 - hosts: load-driver
3   - vars_files:
4   - - ../config.yml
5 3 roles:
6 4 - { role: tomcat, when: "inventory_hostname not in groups['bm-server']" }
7 5 - load-driver
... ...
1 1 ---
2 2 - hosts: mongodb
3   - vars_files:
4   - - ../config.yml
5 3 roles:
6 4 - mongodb
7 5  
... ...
yml/selenium-grid.yml
... ... @@ -2,8 +2,6 @@
2 2 - hosts:
3 3 - selenium-hub
4 4 - load-driver
5   - vars_files:
6   - - ../config.yml
7 5 roles:
8 6 - selenium
9 7  
... ...