Merge "Advanced tags support"

This commit is contained in:
Jenkins 2015-12-17 20:39:11 +00:00 committed by Gerrit Code Review
commit 14109e3f26

View File

@ -14,21 +14,21 @@ resources:
ip: {{node}}::ip ip: {{node}}::ip
updates: updates:
- with_tags: ['resource=hosts_file'] - with_tags: 'resource=hosts_file'
values: values:
hosts:name: hosts:name:
- riak_service{{index}}::riak_hostname::NO_EVENTS - riak_service{{index}}::riak_hostname::NO_EVENTS
hosts:ip: hosts:ip:
- riak_service{{index}}::ip::NO_EVENTS - riak_service{{index}}::ip::NO_EVENTS
- with_tags: ['resource=haproxy_service_config', 'service=riak', 'protocol=http'] - with_tags: 'resource=haproxy_service_config & service=riak & protocol=http'
values: values:
backends:server: backends:server:
- riak_service{{index}}::riak_hostname - riak_service{{index}}::riak_hostname
backends:port: backends:port:
- riak_service{{index}}::riak_port_http - riak_service{{index}}::riak_port_http
- with_tags: ['resource=haproxy_service_config', 'service=riak', 'protocol=tcp'] - with_tags: 'resource=haproxy_service_config & service=riak & protocol=tcp'
values: values:
backends:server: backends:server:
- riak_service{{index}}::riak_hostname - riak_service{{index}}::riak_hostname
@ -38,7 +38,7 @@ updates:
events: events:
- type: depends_on - type: depends_on
parent: parent:
with_tags: ['resource=hosts_file', 'location={{node}}'] with_tags: 'resource=hosts_file & location={{node}}'
action: run action: run
state: success state: success
depend_action: riak_service{{index}}.run depend_action: riak_service{{index}}.run