openstack/kolla-ansible
Code Issues Proposed changes

Install neutron in manila-share group only when enable_manila is true

Browse Source 
TrivialFix

Change-Id: Idfc5d03d3359003cdb82b85b71b87ccefd4a0a43
This commit is contained in:
Jeffrey Zhang 2016-03-21 01:11:13 +08:00
parent e9b9a84157
commit b13c18ae9c
4 changed files with 21 additions and 21 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 - include: config.yml
when: inventory_hostname in groups['compute'] when: inventory_hostname in groups['compute']
or inventory_hostname in groups['manila-share'] or (enable_manila | bool and inventory_hostname in groups['manila-share'])
or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent'] or inventory_hostname in groups['neutron-metadata-agent']
@ -23,7 +23,7 @@
- include: start.yml - include: start.yml
when: inventory_hostname in groups['compute'] when: inventory_hostname in groups['compute']
or inventory_hostname in groups['manila-share'] or (enable_manila | bool and inventory_hostname in groups['manila-share'])
or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent'] or inventory_hostname in groups['neutron-metadata-agent']

18
ansible/roles/neutron/tasks/do_reconfigure.yml
View File

@ -21,7 +21,7 @@
when: when:
- ( - (
( inventory_hostname in groups['compute'] ( inventory_hostname in groups['compute']
or inventory_hostname in groups['manila-share'] or (enable_manila | bool and inventory_hostname in groups['manila-share'])
or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent'] or inventory_hostname in groups['neutron-metadata-agent']
@ -43,7 +43,7 @@
failed_when: container_state.Running == false failed_when: container_state.Running == false
when: when:
- (inventory_hostname in groups['compute'] - (inventory_hostname in groups['compute']
or inventory_hostname in groups['manila-share'] or (enable_manila | bool and inventory_hostname in groups['manila-share'])
or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent']) or inventory_hostname in groups['neutron-metadata-agent'])
@ -70,7 +70,7 @@
when: when:
- ( - (
( inventory_hostname in groups['compute'] ( inventory_hostname in groups['compute']
or inventory_hostname in groups['manila-share'] or (enable_manila | bool and inventory_hostname in groups['manila-share'])
or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent'] or inventory_hostname in groups['neutron-metadata-agent']
@ -90,7 +90,7 @@
failed_when: false failed_when: false
when: when:
- (inventory_hostname in groups['compute'] - (inventory_hostname in groups['compute']
or inventory_hostname in groups['manila-share'] or (enable_manila | bool and inventory_hostname in groups['manila-share'])
or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent']) or inventory_hostname in groups['neutron-metadata-agent'])
@ -118,7 +118,7 @@
when: when:
- ( - (
( inventory_hostname in groups['compute'] ( inventory_hostname in groups['compute']
or inventory_hostname in groups['manila-share'] or (enable_manila | bool and inventory_hostname in groups['manila-share'])
or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent'] or inventory_hostname in groups['neutron-metadata-agent']
@ -138,7 +138,7 @@
action: "get_container_env" action: "get_container_env"
when: when:
- (inventory_hostname in groups['compute'] - (inventory_hostname in groups['compute']
or inventory_hostname in groups['manila-share'] or (enable_manila | bool and inventory_hostname in groups['manila-share'])
or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent']) or inventory_hostname in groups['neutron-metadata-agent'])
@ -171,7 +171,7 @@
- item[1]['rc'] == 1 - item[1]['rc'] == 1
- ( - (
( inventory_hostname in groups['compute'] ( inventory_hostname in groups['compute']
or inventory_hostname in groups['manila-share'] or (enable_manila | bool and inventory_hostname in groups['manila-share'])
or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent'] or inventory_hostname in groups['neutron-metadata-agent']
@ -236,7 +236,7 @@
- item[1]['rc'] == 1 - item[1]['rc'] == 1
- ( - (
( inventory_hostname in groups['compute'] ( inventory_hostname in groups['compute']
or inventory_hostname in groups['manila-share'] or (enable_manila | bool and inventory_hostname in groups['manila-share'])
or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent'] or inventory_hostname in groups['neutron-metadata-agent']
@ -262,7 +262,7 @@
- item[0]['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE' - item[0]['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE'
- item[1]['rc'] == 1 - item[1]['rc'] == 1
- (inventory_hostname in groups['compute'] - (inventory_hostname in groups['compute']
or inventory_hostname in groups['manila-share'] or (enable_manila | bool and inventory_hostname in groups['manila-share'])
or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-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 }}" image: "{{ neutron_linuxbridge_agent_image_full }}"
when: when:
- (inventory_hostname in groups['compute'] - (inventory_hostname in groups['compute']
or inventory_hostname in groups['manila-share'] or (enable_manila | bool and inventory_hostname in groups['manila-share'])
or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent']) or inventory_hostname in groups['neutron-metadata-agent'])
@ -40,7 +40,7 @@
image: "{{ neutron_openvswitch_agent_image_full }}" image: "{{ neutron_openvswitch_agent_image_full }}"
when: when:
- (inventory_hostname in groups['compute'] - (inventory_hostname in groups['compute']
or inventory_hostname in groups['manila-share'] or (enable_manila | bool and inventory_hostname in groups['manila-share'])
or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent']) or inventory_hostname in groups['neutron-metadata-agent'])
@ -60,7 +60,7 @@
image: "{{ openvswitch_db_image_full }}" image: "{{ openvswitch_db_image_full }}"
when: when:
- (inventory_hostname in groups['compute'] - (inventory_hostname in groups['compute']
or inventory_hostname in groups['manila-share'] or (enable_manila | bool and inventory_hostname in groups['manila-share'])
or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent']) or inventory_hostname in groups['neutron-metadata-agent'])
@ -73,7 +73,7 @@
image: "{{ openvswitch_vswitchd_image_full }}" image: "{{ openvswitch_vswitchd_image_full }}"
when: when:
- (inventory_hostname in groups['compute'] - (inventory_hostname in groups['compute']
or inventory_hostname in groups['manila-share'] or (enable_manila | bool and inventory_hostname in groups['manila-share'])
or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-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/" - "openvswitch_db:/var/lib/openvswitch/"
when: when:
- (inventory_hostname in groups['compute'] - (inventory_hostname in groups['compute']
or inventory_hostname in groups['manila-share'] or (enable_manila | bool and inventory_hostname in groups['manila-share'])
or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent']) or inventory_hostname in groups['neutron-metadata-agent'])
@ -26,7 +26,7 @@
delay: 2 delay: 2
when: when:
- (inventory_hostname in groups['compute'] - (inventory_hostname in groups['compute']
or inventory_hostname in groups['manila-share'] or (enable_manila | bool and inventory_hostname in groups['manila-share'])
or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent']) or inventory_hostname in groups['neutron-metadata-agent'])
@ -38,7 +38,7 @@
changed_when: status.stdout.find('changed') != -1 changed_when: status.stdout.find('changed') != -1
when: when:
- (inventory_hostname in groups['compute'] - (inventory_hostname in groups['compute']
or inventory_hostname in groups['manila-share'] or (enable_manila | bool and inventory_hostname in groups['manila-share'])
or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent']) or inventory_hostname in groups['neutron-metadata-agent'])
@ -57,7 +57,7 @@
- "/run:/run" - "/run:/run"
when: when:
- (inventory_hostname in groups['compute'] - (inventory_hostname in groups['compute']
or inventory_hostname in groups['manila-share'] or (enable_manila | bool and inventory_hostname in groups['manila-share'])
or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent']) or inventory_hostname in groups['neutron-metadata-agent'])
@ -89,7 +89,7 @@
when: when:
- ( - (
( inventory_hostname in groups['compute'] ( inventory_hostname in groups['compute']
or inventory_hostname in groups['manila-share'] or (enable_manila | bool and inventory_hostname in groups['manila-share'])
or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent'] or inventory_hostname in groups['neutron-metadata-agent']
@ -139,7 +139,7 @@
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
when: when:
- (inventory_hostname in groups['compute'] - (inventory_hostname in groups['compute']
or inventory_hostname in groups['manila-share'] or (enable_manila | bool and inventory_hostname in groups['manila-share'])
or inventory_hostname in groups['neutron-dhcp-agent'] or inventory_hostname in groups['neutron-dhcp-agent']
or inventory_hostname in groups['neutron-l3-agent'] or inventory_hostname in groups['neutron-l3-agent']
or inventory_hostname in groups['neutron-metadata-agent']) or inventory_hostname in groups['neutron-metadata-agent'])