Switch from playbook vars to role defaults

By using role defauts, we can have inventory variables
which overide the defaults.
This commit is contained in:
Slavi Pantaleev 2017-08-30 12:00:47 +03:00
parent ce3c31eb41
commit b046052aed
3 changed files with 2 additions and 5 deletions

View file

@ -84,7 +84,7 @@ You can follow these steps:
- copy the sample configuration file (`cp examples/host-vars.yml inventory/matrix.<your-domain>/vars.yml`) - copy the sample configuration file (`cp examples/host-vars.yml inventory/matrix.<your-domain>/vars.yml`)
- edit the configuration file (`inventory/matrix.<your-domain>/vars.yml`) to your liking - edit the configuration file (`inventory/matrix.<your-domain>/vars.yml`) to your liking. You may also take a look at `roles/matrix-server/defaults.main.yml` and see if there's something you'd like to copy over and override in your `vars.yml` configuration file.
- copy the sample inventory hosts file (`cp examples/hosts inventory/hosts`) - copy the sample inventory hosts file (`cp examples/hosts inventory/hosts`)

View file

@ -44,4 +44,4 @@ matrix_services_restart_cron_time_definition: "15 4 3 * *"
matrix_coturn_turn_udp_min_port: 49152 matrix_coturn_turn_udp_min_port: 49152
matrix_coturn_turn_udp_max_port: 49172 matrix_coturn_turn_udp_max_port: 49172
matrix_coturn_turn_external_ip_address: "{{ ansible_host }}" matrix_coturn_turn_external_ip_address: "{{ ansible_host }}"

View file

@ -3,8 +3,5 @@
hosts: "{{ target if target is defined else 'matrix-servers' }}" hosts: "{{ target if target is defined else 'matrix-servers' }}"
become: true become: true
vars_files:
- vars/vars.yml
roles: roles:
- matrix-server - matrix-server