9fe70f45f3
As neutron-vpnaas-agent has been loaded just inside of the existing l3 agent rather than requiring operators to run a completely different binary with a subclass of the existing L3 agent[1]. We need restructure this role to fit with this new feature. [1] https://review.openstack.org/488247 Depends-On: I47cd8ba5a14da3c76d5b1eb0b4c0cf0c729eb2ff Change-Id: Id690a652bc9facf1c3e39358f548ab7ddd967d80 Implements: blueprint restructure-neutron-vpnaas Closes-Bug: #1731498
59 lines
2.4 KiB
YAML
59 lines
2.4 KiB
YAML
---
|
|
project_name: "openvswitch"
|
|
|
|
openvswitch_services:
|
|
openvswitch-db-server:
|
|
container_name: "openvswitch_db"
|
|
image: "{{ openvswitch_db_image_full }}"
|
|
enabled: "{{ enable_openvswitch }}"
|
|
group: openvswitch
|
|
host_in_groups: >-
|
|
{{
|
|
inventory_hostname in groups['compute']
|
|
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-l3-agent']
|
|
or inventory_hostname in groups['neutron-metadata-agent']
|
|
}}
|
|
volumes:
|
|
- "{{ node_config_directory }}/openvswitch-db-server/:{{ container_config_directory }}/:ro"
|
|
- "/etc/localtime:/etc/localtime:ro"
|
|
- "/lib/modules:/lib/modules:ro"
|
|
- "/run:/run:shared"
|
|
- "kolla_logs:/var/log/kolla/"
|
|
- "openvswitch_db:/var/lib/openvswitch/"
|
|
openvswitch-vswitchd:
|
|
container_name: "openvswitch_vswitchd"
|
|
image: "{{ openvswitch_vswitchd_image_full }}"
|
|
enabled: "{{ enable_openvswitch }}"
|
|
group: openvswitch
|
|
host_in_groups: >-
|
|
{{
|
|
inventory_hostname in groups['compute']
|
|
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-l3-agent']
|
|
or inventory_hostname in groups['neutron-metadata-agent']
|
|
}}
|
|
privileged: True
|
|
volumes:
|
|
- "{{ node_config_directory }}/openvswitch-vswitchd/:{{ container_config_directory }}/:ro"
|
|
- "/etc/localtime:/etc/localtime:ro"
|
|
- "/lib/modules:/lib/modules:ro"
|
|
- "/run:/run:shared"
|
|
- "kolla_logs:/var/log/kolla/"
|
|
|
|
####################
|
|
# Docker
|
|
####################
|
|
openvswitch_install_type: "{{ kolla_install_type }}"
|
|
openvswitch_tag: "{{ openstack_release }}"
|
|
|
|
openvswitch_db_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ openvswitch_install_type }}-openvswitch-db-server"
|
|
openvswitch_db_tag: "{{ openvswitch_tag }}"
|
|
openvswitch_db_image_full: "{{ openvswitch_db_image }}:{{ openvswitch_db_tag }}"
|
|
|
|
openvswitch_vswitchd_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ docker_namespace }}/{{ kolla_base_distro }}-{{ openvswitch_install_type }}-openvswitch-vswitchd"
|
|
openvswitch_vswitchd_tag: "{{ openvswitch_tag }}"
|
|
openvswitch_vswitchd_image_full: "{{ openvswitch_vswitchd_image }}:{{ openvswitch_vswitchd_tag }}"
|