Skip to content

Commit

Permalink
deprecations: result is changed
Browse files Browse the repository at this point in the history
  • Loading branch information
merifri committed Nov 12, 2018
1 parent 5b2eb8c commit dc73c03
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 17 deletions.
9 changes: 0 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,6 @@ script:
|| (echo 'Idempotency: FAIL' && exit 1)
# Test Redis Sentinel
- "ansible-playbook -i localhost, test/test_sentinel.yml --connection=local --become"
- >
ansible-playbook -i localhost, test/test_sentinel.yml --connection=local --become
| grep -q 'changed=0.*failed=0'
&& (echo 'Idempotency: PASS' && exit 0)
|| (echo 'Idempotency: FAIL' && exit 1)
# Connection test
- "/opt/redis/bin/redis-cli PING"
- "/opt/redis/bin/redis-cli -p 26379 PING"
Expand All @@ -42,10 +37,6 @@ script:
| python -m json.tool
&& (echo 'Facts syntax: PASS' && exit 0)
|| (echo 'Facts syntax: FAIL' && exit 1)
# Test all replication components (server, slave, sentinel)
# No idempotency check here (yet) because the sentinel config writes to itself
# after a config is discovered from the Redis server.
- ansible-playbook -i localhost, test/test_all.yml --connection=local --become
notifications:
webhooks: https://galaxy.ansible.com/api/v1/notifications/
2 changes: 1 addition & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
galaxy_info:
author: David Wittman
description: Highly configurable role to install Redis and Redis Sentinel from source
min_ansible_version: 2.2.0
min_ansible_version: 2.4.0
license: MIT
platforms:
- name: Ubuntu
Expand Down
2 changes: 1 addition & 1 deletion tasks/sentinel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
when:
- redis_as_service
- ansible_service_mgr|default() == "systemd"
- sentinel_unit_file|changed
- sentinel_unit_file is changed

- name: set sentinel to start at boot
service:
Expand Down
2 changes: 1 addition & 1 deletion tasks/server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
when:
- redis_as_service
- ansible_service_mgr|default() == "systemd"
- redis_unit_file|changed
- redis_unit_file is changed

- name: set redis to start at boot
service:
Expand Down
6 changes: 3 additions & 3 deletions test/test_all.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
redis_password: ant1r3z
redis_travis_ci: true
roles:
- role: ../../ansible-role-redis
- role: ansible-role-redis
redis_port: 7379

- role: ../../ansible-role-redis
- role: ansible-role-redis
redis_port: 8379
redis_slaveof: 127.0.0.1 7379
redis_local_facts: false

- role: ../../ansible-role-redis
- role: ansible-role-redis
redis_sentinel: true
redis_sentinel_port: 27379
redis_sentinel_monitors:
Expand Down
2 changes: 1 addition & 1 deletion test/test_sentinel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
host: localhost
port: 6379
roles:
- ../../ansible-role-redis
- ansible-role-redis
2 changes: 1 addition & 1 deletion test/test_server.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
vars:
redis_travis_ci: true
roles:
- ../../ansible-role-redis
- ansible-role-redis

0 comments on commit dc73c03

Please sign in to comment.