Port with_ loop variable syntax to Ansbile 2 (finish)

Migrate to full variable syntax in with_ loop
instead of bare variables for:

- cinder
- haproxy
- ironic
- magnum
- mistral
- mongodb
- murano
- swift
- watcher

TrivialFix
Change-Id: I3ef2e79053cf609aaa710e43ffd0adbc5a97565b
This commit is contained in:
Duong Ha-Quang 2016-08-17 16:25:55 +07:00
parent bed0f0f8d7
commit 5e35fc54a6
10 changed files with 35 additions and 35 deletions

View File

@ -55,8 +55,8 @@
{ name: cinder_scheduler, group: cinder-scheduler }, { name: cinder_scheduler, group: cinder-scheduler },
{ name: cinder_volume, group: cinder-volume }, { name: cinder_volume, group: cinder-volume },
{ name: cinder_backup, group: cinder-backup }] { name: cinder_backup, group: cinder-backup }]
- container_envs.results - "{{ container_envs.results }}"
- check_results.results - "{{ check_results.results }}"
- include: start.yml - include: start.yml
when: remove_containers.changed when: remove_containers.changed
@ -75,5 +75,5 @@
{ name: cinder_scheduler, group: cinder-scheduler }, { name: cinder_scheduler, group: cinder-scheduler },
{ name: cinder_volume, group: cinder-volume }, { name: cinder_volume, group: cinder-volume },
{ name: cinder_backup, group: cinder-backup }] { name: cinder_backup, group: cinder-backup }]
- container_envs.results - "{{ container_envs.results }}"
- check_results.results - "{{ check_results.results }}"

View File

@ -44,8 +44,8 @@
with_together: with_together:
- [{ name: haproxy, group: haproxy }, - [{ name: haproxy, group: haproxy },
{ name: keepalived, group: haproxy }] { name: keepalived, group: haproxy }]
- container_envs.results - "{{ container_envs.results }}"
- check_results.results - "{{ check_results.results }}"
- include: start.yml - include: start.yml
when: remove_containers.changed when: remove_containers.changed

View File

@ -52,8 +52,8 @@
{ name: ironic_api, group: ironic-api }, { name: ironic_api, group: ironic-api },
{ name: ironic_conductor, group: ironic-conductor }, { name: ironic_conductor, group: ironic-conductor },
{ name: ironic_inspector, group: ironic-inspector }] { name: ironic_inspector, group: ironic-inspector }]
- container_envs.results - "{{ container_envs.results }}"
- check_results.results - "{{ check_results.results }}"
- include: start.yml - include: start.yml
when: remove_containers.changed when: remove_containers.changed
@ -72,5 +72,5 @@
{ name: ironic_api, group: ironic-api }, { name: ironic_api, group: ironic-api },
{ name: ironic_conductor, group: ironic-conductor }, { name: ironic_conductor, group: ironic-conductor },
{ name: ironic_inspector, group: ironic-inspector }] { name: ironic_inspector, group: ironic-inspector }]
- container_envs.results - "{{ container_envs.results }}"
- check_results.results - "{{ check_results.results }}"

View File

@ -47,8 +47,8 @@
with_together: with_together:
- [{ name: magnum_api, group: magnum-api }, - [{ name: magnum_api, group: magnum-api },
{ name: magnum_conductor, group: magnum-conductor }] { name: magnum_conductor, group: magnum-conductor }]
- container_envs.results - "{{ container_envs.results }}"
- check_results.results - "{{ check_results.results }}"
- include: start.yml - include: start.yml
when: remove_containers.changed when: remove_containers.changed
@ -65,5 +65,5 @@
with_together: with_together:
- [{ name: magnum_api, group: magnum-api }, - [{ name: magnum_api, group: magnum-api },
{ name: magnum_conductor, group: magnum-conductor }] { name: magnum_conductor, group: magnum-conductor }]
- container_envs.results - "{{ container_envs.results }}"
- check_results.results - "{{ check_results.results }}"

View File

@ -48,8 +48,8 @@
- [{ name: mistral_api, group: mistral-api }, - [{ name: mistral_api, group: mistral-api },
{ name: mistral_engine, group: mistral-engine }, { name: mistral_engine, group: mistral-engine },
{ name: mistral_executor, group: mistral-executor }] { name: mistral_executor, group: mistral-executor }]
- container_envs.results - "{{ container_envs.results }}"
- check_results.results - "{{ check_results.results }}"
- include: start.yml - include: start.yml
when: remove_containers.changed when: remove_containers.changed
@ -67,5 +67,5 @@
- [{ name: mistral_api, group: mistral-api }, - [{ name: mistral_api, group: mistral-api },
{ name: mistral_engine, group: mistral-engine }, { name: mistral_engine, group: mistral-engine },
{ name: mistral_executor, group: mistral-executor }] { name: mistral_executor, group: mistral-executor }]
- container_envs.results - "{{ container_envs.results }}"
- check_results.results - "{{ check_results.results }}"

View File

@ -43,8 +43,8 @@
- inventory_hostname in groups[item[0]['group']] - inventory_hostname in groups[item[0]['group']]
with_together: with_together:
- [{ name: mongodb, group: mongodb }] - [{ name: mongodb, group: mongodb }]
- container_envs.results - "{{ container_envs.results }}"
- check_results.results - "{{ check_results.results }}"
- include: start.yml - include: start.yml
when: remove_containers.changed when: remove_containers.changed
@ -60,5 +60,5 @@
- inventory_hostname in groups[item[0]['group']] - inventory_hostname in groups[item[0]['group']]
with_together: with_together:
- [{ name: mongodb, group: mongodb }] - [{ name: mongodb, group: mongodb }]
- container_envs.results - "{{ container_envs.results }}"
- check_results.results - "{{ check_results.results }}"

View File

@ -44,8 +44,8 @@
with_together: with_together:
- [{ name: murano_api, group: murano-api }, - [{ name: murano_api, group: murano-api },
{ name: murano_engine, group: murano-engine }] { name: murano_engine, group: murano-engine }]
- container_envs.results - "{{ container_envs.results }}"
- check_results.results - "{{ check_results.results }}"
- include: start.yml - include: start.yml
when: remove_containers.changed when: remove_containers.changed
@ -62,5 +62,5 @@
with_together: with_together:
- [{ name: murano_api, group: murano-api }, - [{ name: murano_api, group: murano-api },
{ name: murano_engine, group: murano-engine }] { name: murano_engine, group: murano-engine }]
- container_envs.results - "{{ container_envs.results }}"
- check_results.results - "{{ check_results.results }}"

View File

@ -107,8 +107,8 @@
{ name: swift_object_expirer, group: swift-object-server }, { name: swift_object_expirer, group: swift-object-server },
{ name: swift_rsyncd, group: swift-object-server }, { name: swift_rsyncd, group: swift-object-server },
{ name: swift_proxy_server, group: swift-proxy-server }] { name: swift_proxy_server, group: swift-proxy-server }]
- container_envs.results - "{{ container_envs.results }}"
- check_results.results - "{{ check_results.results }}"
- include: start.yml - include: start.yml
when: remove_containers.changed when: remove_containers.changed
@ -140,5 +140,5 @@
{ name: swift_object_expirer, group: swift-object-server }, { name: swift_object_expirer, group: swift-object-server },
{ name: swift_rsyncd, group: swift-object-server }, { name: swift_rsyncd, group: swift-object-server },
{ name: swift_proxy_server, group: swift-proxy-server }] { name: swift_proxy_server, group: swift-proxy-server }]
- container_envs.results - "{{ container_envs.results }}"
- check_results.results - "{{ check_results.results }}"

View File

@ -26,7 +26,7 @@
opts: "noatime,nodiratime,nobarrier,logbufs=8" opts: "noatime,nodiratime,nobarrier,logbufs=8"
state: mounted state: mounted
name: "{{ swift_devices_mount_point }}/{{ item['fs_label'] }}" name: "{{ swift_devices_mount_point }}/{{ item['fs_label'] }}"
with_items: swift_disks with_items: "{{ swift_disks }}"
when: inventory_hostname in groups['swift-account-server'] or when: inventory_hostname in groups['swift-account-server'] or
inventory_hostname in groups['swift-container-server'] or inventory_hostname in groups['swift-container-server'] or
inventory_hostname in groups['swift-object-server'] inventory_hostname in groups['swift-object-server']

View File

@ -48,8 +48,8 @@
- [{ name: watcher_api, group: watcher-api }, - [{ name: watcher_api, group: watcher-api },
{ name: watcher_engine, group: watcher-engine }, { name: watcher_engine, group: watcher-engine },
{ name: watcher_applier, group: watcher-applier }] { name: watcher_applier, group: watcher-applier }]
- container_envs.results - "{{ container_envs.results }}"
- check_results.results - "{{ check_results.results }}"
- include: start.yml - include: start.yml
when: remove_containers.changed when: remove_containers.changed
@ -67,5 +67,5 @@
- [{ name: watcher_api, group: watcher-api }, - [{ name: watcher_api, group: watcher-api },
{ name: watcher_engine, group: watcher-engine }, { name: watcher_engine, group: watcher-engine },
{ name: watcher_applier, group: watcher-applier }] { name: watcher_applier, group: watcher-applier }]
- container_envs.results - "{{ container_envs.results }}"
- check_results.results - "{{ check_results.results }}"