openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix the syntax error for manila in neutron role"

Browse Source
This commit is contained in:
Jenkins 2016-02-28 22:36:31 +00:00 committed by Gerrit Code Review
commit 846a19035a
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ansible/roles/neutron/tasks/deploy.yml
View File

@ -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']

8
ansible/roles/neutron/tasks/pull.yml
View File

@ -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'])

12
ansible/roles/neutron/tasks/start.yml
View File

@ -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'])