diff options
| author | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-02-27 11:32:37 +0800 |
|---|---|---|
| committer | Jeffrey Zhang <jeffrey.zhang@99cloud.net> | 2016-02-28 11:21:30 +0800 |
| commit | 4af394a242e9a3ccf84ea85d997ffd58b66d0a43 (patch) | |
| tree | 167af41fec287c1a7654598aa520f3b32ee759e5 | |
| parent | c81097df8b0525bcff9df875f38bbfe2ab83be3f (diff) | |
| download | kolla-4af394a242e9a3ccf84ea85d997ffd58b66d0a43.tar.gz kolla-4af394a242e9a3ccf84ea85d997ffd58b66d0a43.zip | |
Fix the syntax error for manila in neutron role
This is introduced by I21904659b1789fa71118401bfb6ac2227ae564da
TrivialFix
Change-Id: I8ab62c5b6c69e198e29205518941a9b0054c105f
| -rw-r--r-- | ansible/roles/neutron/tasks/deploy.yml | 4 | ||||
| -rw-r--r-- | ansible/roles/neutron/tasks/pull.yml | 8 | ||||
| -rw-r--r-- | ansible/roles/neutron/tasks/start.yml | 12 |
3 files changed, 12 insertions, 12 deletions
diff --git a/ansible/roles/neutron/tasks/deploy.yml b/ansible/roles/neutron/tasks/deploy.yml index 524f0418c..657db4795 100644 --- a/ansible/roles/neutron/tasks/deploy.yml +++ b/ansible/roles/neutron/tasks/deploy.yml @@ -7,7 +7,7 @@ - include: config.yml when: inventory_hostname in groups['compute'] - inventory_hostname in groups['manila-share'] + or inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent'] @@ -23,7 +23,7 @@ - include: start.yml when: inventory_hostname in groups['compute'] - inventory_hostname in groups['manila-share'] + or inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent'] diff --git a/ansible/roles/neutron/tasks/pull.yml b/ansible/roles/neutron/tasks/pull.yml index 863115bbb..54061e48a 100644 --- a/ansible/roles/neutron/tasks/pull.yml +++ b/ansible/roles/neutron/tasks/pull.yml @@ -20,7 +20,7 @@ image: "{{ neutron_linuxbridge_agent_image_full }}" when: - (inventory_hostname in groups['compute'] - inventory_hostname in groups['manila-share'] + or inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent']) @@ -40,7 +40,7 @@ image: "{{ neutron_openvswitch_agent_image_full }}" when: - (inventory_hostname in groups['compute'] - inventory_hostname in groups['manila-share'] + or inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent']) @@ -60,7 +60,7 @@ image: "{{ openvswitch_db_image_full }}" when: - (inventory_hostname in groups['compute'] - inventory_hostname in groups['manila-share'] + or inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent']) @@ -73,7 +73,7 @@ image: "{{ openvswitch_vswitchd_image_full }}" when: - (inventory_hostname in groups['compute'] - inventory_hostname in groups['manila-share'] + or inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent']) diff --git a/ansible/roles/neutron/tasks/start.yml b/ansible/roles/neutron/tasks/start.yml index 1a59ac09f..90f8a6b9c 100644 --- a/ansible/roles/neutron/tasks/start.yml +++ b/ansible/roles/neutron/tasks/start.yml @@ -11,7 +11,7 @@ - "openvswitch_db:/var/lib/openvswitch/" when: - (inventory_hostname in groups['compute'] - inventory_hostname in groups['manila-share'] + or inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent']) @@ -26,7 +26,7 @@ delay: 2 when: - (inventory_hostname in groups['compute'] - inventory_hostname in groups['manila-share'] + or inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent']) @@ -38,7 +38,7 @@ changed_when: status.stdout.find('changed') != -1 when: - (inventory_hostname in groups['compute'] - inventory_hostname in groups['manila-share'] + or inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent']) @@ -57,7 +57,7 @@ - "/run:/run" when: - (inventory_hostname in groups['compute'] - inventory_hostname in groups['manila-share'] + or inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent']) @@ -89,7 +89,7 @@ when: - ( ( inventory_hostname in groups['compute'] - inventory_hostname in groups['manila-share'] + or inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent'] @@ -139,7 +139,7 @@ - "kolla_logs:/var/log/kolla/" when: - (inventory_hostname in groups['compute'] - inventory_hostname in groups['manila-share'] + or inventory_hostname in groups['manila-share'] or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-metadata-agent']) |