openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix the host_in_groups error in kolla-kubernetes."

Browse Source
This commit is contained in:
Jenkins 2017-02-14 16:00:25 +00:00 committed by Gerrit Code Review
commit fe3bb84a22
1 changed files with 59 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ansible/roles/neutron/defaults/main.yml
View File

@ -8,6 +8,7 @@ neutron_services:
enabled: "{{ neutron_plugin_agent == 'openvswitch' }}" enabled: "{{ neutron_plugin_agent == 'openvswitch' }}"
host_in_groups: >- host_in_groups: >-
{{ {{
True if orchestration_engine == 'KUBERNETES' else
inventory_hostname in groups['compute'] inventory_hostname in groups['compute']
or (enable_manila | bool and 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']
@ -27,6 +28,7 @@ neutron_services:
enabled: "{{ neutron_plugin_agent == 'openvswitch' }}" enabled: "{{ neutron_plugin_agent == 'openvswitch' }}"
host_in_groups: >- host_in_groups: >-
{{ {{
True if orchestration_engine == 'KUBERNETES' else
inventory_hostname in groups['compute'] inventory_hostname in groups['compute']
or (enable_manila | bool and 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']
@ -46,7 +48,7 @@ neutron_services:
image: "{{ neutron_server_image_full }}" image: "{{ neutron_server_image_full }}"
enabled: true enabled: true
group: "neutron-server" group: "neutron-server"
host_in_groups: "{{ inventory_hostname in groups['neutron-server'] }}" host_in_groups: "{{ True if orchestration_engine == 'KUBERNETES' else inventory_hostname in groups['neutron-server'] }}"
volumes: volumes:
- "{{ node_config_directory }}/neutron-server/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/neutron-server/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
@ -58,6 +60,7 @@ neutron_services:
privileged: True privileged: True
host_in_groups: >- host_in_groups: >-
{{ {{
True if orchestration_engine == 'KUBERNETES' else
( inventory_hostname in groups['compute'] ( inventory_hostname in groups['compute']
or (enable_manila | bool and 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']
@ -86,7 +89,8 @@ neutron_services:
privileged: True privileged: True
host_in_groups: >- host_in_groups: >-
{{ {{
( inventory_hostname in groups['compute'] True if orchestration_engine == 'KUBERNETES' else
( inventory_hostname in groups['compute'] or
or (enable_manila | bool and 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']
@ -116,6 +120,7 @@ neutron_services:
NEUTRON_INTERFACE: "{{ neutron_external_interface }}" NEUTRON_INTERFACE: "{{ neutron_external_interface }}"
host_in_groups: >- host_in_groups: >-
{{ {{
True if orchestration_engine == 'KUBERNETES' else
inventory_hostname in groups['compute'] inventory_hostname in groups['compute']
or (enable_manila | bool and 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']
@ -135,7 +140,7 @@ neutron_services:
privileged: True privileged: True
enabled: True enabled: True
group: "neutron-dhcp-agent" group: "neutron-dhcp-agent"
host_in_groups: "{{ inventory_hostname in groups['neutron-dhcp-agent'] }}" host_in_groups: "{{ True if orchestration_engine == 'KUBERNETES' else inventory_hostname in groups['neutron-dhcp-agent'] }}"
volumes: volumes:
- "{{ node_config_directory }}/neutron-dhcp-agent/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/neutron-dhcp-agent/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
@ -150,6 +155,7 @@ neutron_services:
enabled: "{{ not enable_neutron_vpnaas | bool }}" enabled: "{{ not enable_neutron_vpnaas | bool }}"
host_in_groups: >- host_in_groups: >-
{{ {{
True if orchestration_engine == 'KUBERNETES' else
inventory_hostname in groups['neutron-l3-agent'] inventory_hostname in groups['neutron-l3-agent']
or (inventory_hostname in groups['compute'] and enable_neutron_dvr | bool) or (inventory_hostname in groups['compute'] and enable_neutron_dvr | bool)
}} }}
@ -166,7 +172,7 @@ neutron_services:
privileged: True privileged: True
enabled: "{{ enable_neutron_lbaas | bool }}" enabled: "{{ enable_neutron_lbaas | bool }}"
group: "neutron-lbaas-agent" group: "neutron-lbaas-agent"
host_in_groups: "{{ inventory_hostname in groups['neutron-lbaas-agent'] }}" host_in_groups: "{{ True if orchestration_engine == 'KUBERNETES' else inventory_hostname in groups['neutron-lbaas-agent'] }}"
volumes: volumes:
- "{{ node_config_directory }}/neutron-lbaas-agent/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/neutron-lbaas-agent/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
@ -181,6 +187,7 @@ neutron_services:
enabled: true enabled: true
host_in_groups: >- host_in_groups: >-
{{ {{
True if orchestration_engine == 'KUBERNETES' else
inventory_hostname in groups['neutron-metadata-agent'] inventory_hostname in groups['neutron-metadata-agent']
or (inventory_hostname in groups['compute'] and enable_neutron_dvr | bool) or (inventory_hostname in groups['compute'] and enable_neutron_dvr | bool)
}} }}
@ -196,7 +203,7 @@ neutron_services:
privileged: True privileged: True
enabled: "{{ enable_neutron_vpnaas | bool }}" enabled: "{{ enable_neutron_vpnaas | bool }}"
group: "neutron-vpnaas-agent" group: "neutron-vpnaas-agent"
host_in_groups: "{{ inventory_hostname in groups['neutron-vpnaas-agent'] }}" host_in_groups: "{{ True if orchestration_engine == 'KUBERNETES' else inventory_hostname in groups['neutron-vpnaas-agent'] }}"
volumes: volumes:
- "{{ node_config_directory }}/neutron-vpnaas-agent/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/neutron-vpnaas-agent/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"