From 4af394a242e9a3ccf84ea85d997ffd58b66d0a43 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <jeffrey.zhang@99cloud.net>
Date: Sat, 27 Feb 2016 11:32:37 +0800
Subject: [PATCH] Fix the syntax error for manila in neutron role
This is introduced by I21904659b1789fa71118401bfb6ac2227ae564da
TrivialFix
Change-Id: I8ab62c5b6c69e198e29205518941a9b0054c105f
---
ansible/roles/neutron/tasks/deploy.yml | 4 ++--
ansible/roles/neutron/tasks/pull.yml | 8 ++++----
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 524f0418cc..657db4795c 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 863115bbb5..54061e48a7 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 1a59ac09f1..90f8a6b9c6 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'])