openstack/openstack-ansible-os_neutron
Code Issues Proposed changes

Remove dragonflow ML2 driver

Browse Source 
Dragonflow is no longer maintained as an OpenStack project [1]
and has therefore been removed from OpenStack-Ansible as a
supported ML2 driver for neutron.

[1] https://review.openstack.org/613856

Change-Id: Ia7042e5dd697611ef4d9148b6f345d5da887b2c5
This commit is contained in:
Jesse Pretorius 2018-11-05 14:51:04 +00:00 committed by Jesse Pretorius (odyssey4me)
parent f730c52ff0
commit 78bb29230c
15 changed files with 9 additions and 478 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
defaults/main.yml
View File

@ -63,8 +63,6 @@ neutron_dynamic_routing_git_repo: https://git.openstack.org/openstack/neutron-dy
neutron_dynamic_routing_git_install_branch: master
networking_calico_git_repo: https://git.openstack.org/openstack/networking-calico
networking_calico_git_install_branch: master
dragonflow_git_repo: https://git.openstack.org/openstack/dragonflow
dragonflow_git_install_branch: master
networking_odl_git_repo: https://git.openstack.org/openstack/networking-odl
networking_odl_git_install_branch: master
networking_sfc_git_repo: https://git.openstack.org/openstack/networking-sfc
@ -116,7 +114,7 @@ neutron_agent_down_time: 120
neutron_agent_polling_interval: 5
neutron_report_interval: "{{ neutron_agent_down_time | int / 2 | int }}"
# TODO(evrardjp): Remove this when vpnaas/Dragonflow don't use it anymore.
# TODO(evrardjp): Remove this when vpnaas does not use it anymore.
# This was deprecated in Pike cycle.
neutron_external_network_bridge: ""
@ -159,10 +157,6 @@ neutron_calico_felix_ini_overrides: {}
neutron_calico_felix_init_overrides: {}
neutron_dhcp_agent_ini_overrides: {}
neutron_dhcp_agent_init_overrides: {}
neutron_dragonflow_controller_agent_init_overrides: {}
neutron_dragonflow_ini_overrides: {}
neutron_dragonflow_l3_agent_init_overrides: {}
neutron_dragonflow_pubsub_agent_init_overrides: {}
neutron_l3_agent_ini_overrides: {}
neutron_l3_agent_init_overrides: {}
neutron_lbaas_agent_ini_overrides: {}
@ -441,10 +435,6 @@ neutron_octavia_proxy_plugin: False
neutron_driver_vpnaas: neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver
neutron_vpnaas_service_provider: VPN:strongswan:neutron_vpnaas.services.vpn.service_drivers.ipsec.IPsecVPNDriver:default
###
### Dragonflow Configuration
###
# neutron_management_ip is used to configure the location (IP) of the
# neutron-server
neutron_management_ip: 127.0.0.1
@ -455,22 +445,6 @@ calico_felix_version: 2.3.0
calico_felix_sha256: 6cc538d6d93d2b5e732841769f427ce61a4e7d9a6eedf4ca8d33c4df42cf6419
calico_felix_validate_certs: yes
# Database specific configuration
dragonflow_remote_db_ip: 127.0.0.1 # etcd has local proxy installed
dragonflow_remote_db_port: 4001
dragonflow_port_status_notifier:
dragonflow_apps:
- l2_app.L2App
- l3_proactive_app.L3ProactiveApp
- dhcp_app.DHCPApp
- dnat_app.DNATApp
- sg_app.SGApp
- portsec_app.PortSecApp
dragonflow_ex_peer_patch_port: patch-int
dragonflow_int_peer_patch_port: patch-ex
dragonflow_external_network_bridge: br-ex
dragonflow_publisher_bind_address: "*"
# OVN Defaults
neutron_ovn_northd_service_name: ovn-northd
neutron_ovn_controller_service_name: ovn-controller

9
files/rootwrap.d/dragonflow-controller.filters
View File

@ -1,9 +0,0 @@
# neutron-rootwrap command filters for nodes on which dragonflow SDN network
# controller is used.
#
# This file should be owned by (and only-writeable by) the root user
# format seems to be
# cmd-name: filter-name, raw-command, user, args
[Filters]

6
releasenotes/notes/dragonflow-removed-6285225b5525cd50.yaml Normal file
View File

@ -0,0 +1,6 @@
---
deprecations:
- |
Dragonflow is no longer maintained as an OpenStack project and has
therefore been removed from OpenStack-Ansible as a supported ML2
driver for neutron.

3
tasks/dependent_neutron_roles.yml
View File

@ -27,11 +27,10 @@
vars:
etcd_install_type: proxy
when:
- "neutron_plugin_type in ['ml2.calico', 'ml2.dragonflow']"
- "neutron_plugin_type in ['ml2.calico']"
- "group_names | intersect([
neutron_services['calico-dhcp-agent']['group'],
neutron_services['calico-felix']['group'],
neutron_services['dragonflow-controller-agent']['group'],
neutron_services['neutron-server']['group']
]) | length > 0"

77
tasks/providers/dragonflow_config.yml
View File

@ -1,77 +0,0 @@
---
# Copyright 2016, Jean-Philippe Evrard <jean-philippe@evrard.me>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
- name: Install DragonFlow pip packages
pip:
name: "{{ neutron_optional_dragonflow_pip_packages }}"
state: "{{ neutron_pip_package_state }}"
virtualenv: "{{ neutron_bin | dirname }}"
virtualenv_site_packages: "no"
extra_args: >-
{{ neutron_developer_mode | ternary(pip_install_developer_constraints | default('--constraint /opt/developer-pip-constraints.txt'), '') }}
{{ (pip_install_upper_constraints is defined) | ternary('--constraint ' + pip_install_upper_constraints | default(''),'') }}
{{ pip_install_options | default('') }}
register: install_packages
until: install_packages is success
retries: 5
delay: 2
notify: Restart neutron services
tags:
- dragonflow-install
- dragonflow-pip-packages
- name: Ensure DragonFlow directories exists
file:
path: "{{ item }}"
state: directory
owner: "{{ neutron_system_user_name }}"
group: "{{ neutron_system_group_name }}"
mode: "0755"
with_items:
- "{{ neutron_conf_dir }}/plugins"
- "/var/log/dragonflow"
tags:
- dragonflow-config
- name: Setup DragonFlow configuration
config_template:
src: dragonflow.ini.j2
dest: "{{ neutron_conf_dir }}/dragonflow.ini"
owner: "{{ neutron_system_user_name }}"
group: "{{ neutron_system_group_name }}"
config_overrides: "{{ neutron_dragonflow_ini_overrides }}"
config_type: "ini"
tags:
- dragonflow-config
- name: Setup Dragonflow pub/sub IPC socket folder
file:
path: "/var/run/dragonflow"
state: directory
owner: "{{ neutron_system_user_name }}"
group: "{{ neutron_system_group_name }}"
mode: "0755"
when:
- dragonflow_pub_sub_multiproc_enabled
- name: Setup Dragonflow integration bridge
openvswitch_bridge:
bridge: br-int
state: present
tags:
- dragonflow-config
when:
- (neutron_services['dragonflow-l3-agent']['group'] in group_names) or
(neutron_services['dragonflow-controller-agent']['group'] in group_names)

58
templates/dragonflow.ini.j2
View File

@ -1,58 +0,0 @@
# {{ ansible_managed }}
#
[DEFAULT]
[df]
# The remote db server ip address (IP address value)
remote_db_ip = {{ dragonflow_remote_db_ip }}
remote_db_port = {{ dragonflow_remote_db_port }}
remote_db_hosts = $remote_db_ip:$remote_db_port
# The driver to use for the NB database (string value)
nb_db_class = {{ dragonflow_nb_db_class }}
# Local host VTEP IP (IP address value)
local_ip = {{ neutron_local_ip }}
# Local host management IP
management_ip = {{ neutron_management_ip }}
# List of openflow applications classes to load (string value)
apps_list = {{ dragonflow_apps | join(",") }}
# Enable use of Dragonflow built-in pub/sub (boolean value)
enable_df_pub_sub = {{ dragonflow_pub_sub_driver | default('', True) | length > 0 }}
# Drivers to use for the Dragonflow pub/sub (string value)
pub_sub_driver = {{ dragonflow_pub_sub_driver | default('', True) }}
# Drivers to use for the Dragonflow pub/sub (string value)
pub_sub_multiproc_driver = {{ dragonflow_pub_sub_multiproc_driver }}
# Enable notifier for the Dragonflow port status (boolean value)
enable_port_status_notifier = {{ dragonflow_port_status_notifier | default('', True) | length > 0 }}
# Notifier for the Dragonflow port status (string value)
port_status_notifier = {{ dragonflow_port_status_notifier | default('', True) }}
# Neutron Server Publishers bind address (string value)
publisher_bind_address = {{ dragonflow_publisher_bind_address }}
# Use inter-process publish/subscribe.
pub_sub_use_multiproc = {{ dragonflow_pub_sub_multiproc_enabled }}
{%if dragonflow_pub_sub_multiproc_enabled | bool %}
publisher_multiproc_socket = /var/run/dragonflow/dragonflow-publisher-socket
{% endif %}
# Have each controller get only the part of the topology relevant to it.
enable_selective_topology_distribution = True
[df_dnat_app]
ex_peer_patch_port = {{ dragonflow_ex_peer_patch_port }}
int_peer_patch_port = {{ dragonflow_int_peer_patch_port }}
external_network_bridge = {{ dragonflow_external_network_bridge }}
[df_l2_app]
l2_responder = True

5
templates/neutron.conf.j2
View File

@ -94,14 +94,9 @@ rpc_workers = {{ neutron_rpc_workers }}
{% set dhcp_agents_max = num_agent if num_agent > 2 else 2 %}
# DHCP
{% if neutron_plugin_type == 'ml2.dragonflow' %}
# In dragonflow, DHCP is fully distributed, and DHCP agents are not used
dhcp_agent_notification = False
{% else %}
dhcp_agent_notification = True
dhcp_agents_per_network = {{ dhcp_agents_max }}
dhcp_lease_duration = 86400
{% endif %}
# Driver for external DNS integration. (string value)
{% if neutron_designate_enabled %}

88
tests/dragonflow_inventory
View File

@ -1,88 +0,0 @@
[all]
localhost
infra1
server1
server2
agents1
agents2
[physical_host]
localhost
[all_containers]
infra1
server1
server2
agents1
agents2
[oslomsg_rpc_all]
infra1
[oslomsg_notify_all]
infra1
[rabbitmq_all]
infra1
[galera_all]
infra1
[memcached_all]
infra1
[etcd_all]
infra1
[etcd:children]
etcd_all
[service_all:children]
rabbitmq_all
galera_all
memcached_all
etcd_all
[keystone_all]
infra1
[neutron_server]
server1
server2
[dragonflow_pubsub_agent]
server1
server2
[dragonflow_controller_agent]
localhost
[dragonflow_l3_agent]
agents1
agents2
[neutron_agent]
[neutron_dhcp_agent]
[neutron_linuxbridge_agent]
[neutron_openvswitch_agent]
[neutron_metering_agent]
[neutron_l3_agent]
[neutron_lbaas_agent]
[neutron_metadata_agent]
[neutron_all:children]
neutron_agent
neutron_dhcp_agent
neutron_linuxbridge_agent
neutron_openvswitch_agent
neutron_metering_agent
neutron_l3_agent
neutron_lbaas_agent
neutron_metadata_agent
neutron_server
dragonflow_controller_agent
dragonflow_pubsub_agent
dragonflow_l3_agent
[utility_all]
infra1

70
tests/neutron-overrides-dragonflow.yml
View File

@ -1,70 +0,0 @@
---
# Copyright 2016, YOURSTOCHANGE
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
neutron_plugin_type: ml2.dragonflow
neutron_plugin_base:
- df-l3
- metering
neutron_external_network_bridge: br-ex
neutron_local_ip: 10.1.0.3
tempest_run: yes
tempest_plugins:
- name: neutron
repo: https://git.openstack.org/openstack/neutron
branch: master
- name: dragonflow
repo: https://git.openstack.org/openstack/dragonflow
branch: master
- name: neutron-plugins
repo: https://git.openstack.org/openstack/neutron-tempest-plugin
branch: master
tempest_test_whitelist:
- "neutron_tempest_plugin.api.test_networks*"
dragonflow_fullstack_failing_tests:
- dragonflow.tests.fullstack.test_db_consistent.TestDbConsistent.test_db_consistent
- dragonflow.tests.fullstack.test_l2_flows.TestL2FLows.test_flat_network_flows
- dragonflow.tests.fullstack.test_l2_flows.TestL2FLows.test_tunnel_network_flows
- dragonflow.tests.fullstack.test_l2_flows.TestL2FLows.test_vlan_network_flows
- dragonflow.tests.fullstack.test_l2_flows.TestL2FLows.test_vm_multicast
- dragonflow.tests.fullstack.test_neutron_api.TestNeutronAPIandDB.test_create_delete_qos_policy
- dragonflow.tests.fullstack.test_neutron_api.TestNeutronAPIandDB.test_create_port_with_qospolicy
- dragonflow.tests.fullstack.test_neutron_api.TestNeutronAPIandDB.test_update_port_with_qospolicy
- dragonflow.tests.fullstack.test_object_version.TestObjectVersion.test_qospolicy_version
- dragonflow.tests.fullstack.test_ovsdb_monitor.TestOvsdbMonitor.test_notify_message
- dragonflow.tests.fullstack.test_ovsdb_monitor.TestOvsdbMonitor.test_reply_message
- dragonflow.tests.fullstack.test_portqos.TestPortQos.test_port_with_qospolicy
- dragonflow.tests.fullstack.test_portsec_flows.TestOVSFlowsForPortSecurity.test_anti_spoof_flows
- dragonflow.tests.fullstack.test_pub_sub.TestDbTableMonitors.test_operations
- dragonflow.tests.fullstack.test_pub_sub.TestPubSub.test_pub_sub_add_port
- dragonflow.tests.fullstack.test_pub_sub.TestPubSub.test_pub_sub_add_topic
- dragonflow.tests.fullstack.test_pub_sub.TestPubSub.test_pub_sub_event_number_different_port
- dragonflow.tests.fullstack.test_pub_sub.TestPubSub.test_pub_sub_register_addr
- dragonflow.tests.fullstack.test_pub_sub.TestPubSub.test_pub_sub_update_port
- dragonflow.tests.fullstack.test_responder.ArpResponderTest.test_arp_responder
- dragonflow.tests.fullstack.test_responder.ICMPResponderTest.test_icmp_responder
- dragonflow.tests.fullstack.test_sg_flows.TestOVSFlowsForSecurityGroup.test_associating_flows
- dragonflow.tests.fullstack.test_sg_flows.TestOVSFlowsForSecurityGroup.test_rule_flows
- dragonflow.tests.fullstack.test_topology.TestTopology.test_topology_create_vm
- dragonflow.tests.fullstack.test_topology.TestTopology.test_topology_create_vm2
- dragonflow.tests.fullstack.test_apps.TestDNATApp.test_nat_embedded_packet
- dragonflow.tests.fullstack.test_l3_flows.TestL3Flows.test_router_add_route
- dragonflow.tests.fullstack.test_allowed_address_pairs_flows.TestOVSFlowsForActivePortDectionApp.test_sending_arp_to_controller_flows
- dragonflow.tests.fullstack.test_apps.TestAllowedAddressPairsDetectActive.test_detected_active_port
- dragonflow.tests.fullstack.test_api_nb.Test_API_NB.test_create_lport # Pending patch 418381
- dragonflow.tests.fullstack.test_api_nb.Test_API_NB.test_create_lswitch # Pending patch 418381

64
tests/test-dragonflow-functional.yml
View File

@ -1,64 +0,0 @@
---
# Copyright 2016, Omer Anson <omer.anson@toganetworks.com>
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
- name: Test Dragonflow
hosts: physical_host
user: root
gather_facts: true
post_tasks:
- name: Run Dragonflow fullstack tests
shell: |
. {{ tempest_venv_bin }}/activate
. /root/openrc
export DF_FULLSTACK_USE_ENV=1
export OS_STDOUT_CAPTURE=1
export OS_STDERR_CAPTURE=1
export OS_LOG_CAPTURE=1
python -m subunit.run discover dragonflow.tests.fullstack > /var/log/dragonflow-fullstack.subunit
subunit2html /var/log/dragonflow-fullstack.subunit /var/log/dragonflow-fullstack.html
register: dragonflow_fullstack_tests
tags:
- skip_ansible_lint
when:
- "neutron_plugin_type == 'ml2.dragonflow'"
- name: Ensure etc folder exists in logs
file:
path: /var/log/etc
state: directory
when:
- "neutron_plugin_type == 'ml2.dragonflow'"
- name: Copy config files
shell: |
cp -r /etc/neutron /var/log/etc
register: dragonflow_fullstack_log_copy
tags:
- skip_ansible_lint
when:
- "neutron_plugin_type == 'ml2.dragonflow'"
- name: Verify tests have passed
shell: |
. {{ tempest_venv_bin }}/activate
subunit-filter --without {{ dragonflow_fullstack_failing_tests | join(' --without ') }} -s /var/log/dragonflow-fullstack.subunit | subunit2pyunit
exit $?
tags:
- skip_ansible_lint
when:
- "neutron_plugin_type == 'ml2.dragonflow'"
vars_files:
- common/test-vars.yml

2
tests/test.yml
View File

@ -35,5 +35,3 @@
- import_playbook: common/test-install-tempest.yml
- import_playbook: test-calico-functional.yml
- import_playbook: test-dragonflow-functional.yml

9
tox.ini
View File

@ -120,15 +120,6 @@ commands =
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
[testenv:dragonflow]
setenv =
{[testenv]setenv}
ANSIBLE_INVENTORY={toxinidir}/tests/dragonflow_inventory
ANSIBLE_OVERRIDES={toxinidir}/tests/neutron-overrides-dragonflow.yml
commands =
bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
[testenv:opendaylight]
setenv =
{[testenv]setenv}

60
vars/main.yml
View File

@ -18,8 +18,6 @@
###
neutron_needs_openvswitch: >-
{{ (neutron_services['neutron-openvswitch-agent']['group'] in group_names and neutron_services['neutron-openvswitch-agent'].service_en | bool)
or (neutron_services['dragonflow-controller-agent']['group'] in group_names and neutron_services['dragonflow-controller-agent'].service_en | bool)
or (neutron_services['dragonflow-l3-agent']['group'] in group_names and neutron_services['dragonflow-l3-agent'].service_en | bool)
or (neutron_services['neutron-ovn-northd']['group'] in group_names and (neutron_plugin_type == 'ml2.ovn') | bool)
or (neutron_services['neutron-ovn-controller']['group'] in group_names and (neutron_plugin_type == 'ml2.ovn') | bool)
or ((neutron_services['neutron-server']['group'] not in group_names) and neutron_plugin_type == 'ml2.opendaylight') }}
@ -65,10 +63,6 @@ neutron_optional_lbaas_pip_packages:
neutron_optional_vpnaas_pip_packages:
- neutron_vpnaas
neutron_optional_dragonflow_pip_packages:
- dragonflow
- python-etcd
neutron_optional_opendaylight_pip_packages:
- networking-odl
- ceilometer
@ -92,7 +86,6 @@ neutron_developer_constraints:
- "git+{{ neutron_vpnaas_git_repo }}@{{ neutron_vpnaas_git_install_branch }}#egg=neutron-vpnaas"
- "git+{{ neutron_dynamic_routing_git_repo }}@{{ neutron_dynamic_routing_git_install_branch }}#egg=neutron-dynamic-routing"
- "git+{{ networking_calico_git_repo }}@{{ networking_calico_git_install_branch }}#egg=networking-calico"
- "git+{{ dragonflow_git_repo }}@{{ dragonflow_git_install_branch }}#egg=dragonflow"
- "git+{{ networking_odl_git_repo }}@{{ networking_odl_git_install_branch }}#egg=networking-odl"
- "git+{{ networking_sfc_git_repo }}@{{ networking_sfc_git_install_branch }}#egg=networking-sfc"
- "git+{{ networking_bgpvpn_git_repo }}@{{ networking_bgpvpn_git_install_branch }}#egg=networking-bgpvpn"
@ -170,14 +163,6 @@ neutron_plugins:
plugin_conf_ini_overrides: "{{ neutron_ml2_conf_ini_overrides }}"
plugin_core: ml2
plugin_ini: plugins/ml2/ml2_conf.ini
ml2.dragonflow:
plugin_core: neutron.plugins.ml2.plugin.Ml2Plugin
plugin_ini: plugins/ml2/ml2_conf.ini
drivers_type: "{{ neutron_ml2_drivers_type }}"
mechanisms: "df"
plugin_conf_ini_overrides: "{{ neutron_ml2_conf_ini_overrides }}"
l3_agent_mode: "legacy"
driver_interface: "openvswitch"
nuage:
plugin_core: nuage_neutron.plugins.nuage.plugin.NuagePlugin
plugin_ini: plugins/nuage/nuage.ini
@ -312,15 +297,6 @@ neutron_bgp_speaker_driver: neutron_dynamic_routing.services.bgp.agent.driver.ry
neutron_bgp_router_id: "{{ neutron_local_ip }}"
###
### Dragonflow Plugin Configuration
###
dragonflow_nb_db_class: etcd_nb_db_driver
dragonflow_pub_sub_driver: zmq_pubsub_driver
dragonflow_pub_sub_multiproc_driver: zmq_pubsub_multiproc_driver
dragonflow_pub_sub_multiproc_enabled: "{{ (dragonflow_pub_sub_multiproc_driver | default('', True)) | length > 0 }}"
###
### Services info
###
@ -468,7 +444,7 @@ neutron_services:
group: neutron_server
service_name: neutron-server
service_en: True
execstarts: "{{ neutron_bin }}/neutron-server --config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/{{ neutron_plugins[neutron_plugin_type].plugin_ini }} --log-file={{ neutron_log_dir }}/neutron-server.log {% if neutron_plugin_type == 'ml2.dragonflow' %}--config-file {{ neutron_conf_dir }}/dragonflow.ini{% endif %}"
execstarts: "{{ neutron_bin }}/neutron-server --config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/{{ neutron_plugins[neutron_plugin_type].plugin_ini }} --log-file={{ neutron_log_dir }}/neutron-server.log"
init_config_overrides: "{{ neutron_server_init_overrides }}"
start_order: 1
calico-felix:
@ -507,40 +483,6 @@ neutron_services:
config_type: "ini"
init_config_overrides: "{{ neutron_sriov_nic_agent_init_overrides }}"
start_order: 3
dragonflow-controller-agent:
group: dragonflow_controller_agent
system_user: root
system_group: root
service_name: df-local-controller
service_en: "{{ neutron_plugin_type == 'ml2.dragonflow' }}"
execstarts: "{{ neutron_bin }}/df-local-controller --config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/dragonflow.ini --log-file=/var/log/dragonflow/df-local-controller.log"
config_overrides: "{{ neutron_dragonflow_ini_overrides }}"
config_type: "ini"
init_config_overrides: "{{ neutron_dragonflow_controller_agent_init_overrides }}"
start_order: 3
dragonflow-l3-agent:
group: dragonflow_l3_agent
system_user: root
system_group: root
service_name: df-l3-agent
service_en: "{{ neutron_plugin_type == 'ml2.dragonflow' and neutron_l3 | bool }}"
service_conf_path: "{{ neutron_conf_dir }}"
service_conf: l3_agent.ini
service_rootwrap: rootwrap.d/l3.filters
execstarts: "{{ neutron_bin }}/df-l3-agent --config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/l3_agent.ini --log-file=/var/log/dragonflow/df-l3-agent.log"
config_overrides: "{{ neutron_dragonflow_ini_overrides }}"
config_type: "ini"
init_config_overrides: "{{ neutron_dragonflow_l3_agent_init_overrides }}"
start_order: 3
dragonflow-pubsub-agent:
group: dragonflow_pubsub_agent
service_name: df-publisher-service
service_en: "{{ neutron_plugin_type == 'ml2.dragonflow' }}"
execstarts: "{{ neutron_bin }}/df-publisher-service --config-file {{ neutron_conf_dir }}/neutron.conf --config-file {{ neutron_conf_dir }}/dragonflow.ini --log-file=/var/log/dragonflow/df-publisher-service.log"
config_overrides: "{{ neutron_dragonflow_ini_overrides }}"
config_type: "ini"
init_config_overrides: "{{ neutron_dragonflow_pubsub_agent_init_overrides }}"
start_order: 3
neutron-ovn-northd:
group: neutron_ovn_northd
service_en: False

6
zuul.d/jobs.yaml
View File

@ -37,12 +37,6 @@
vars:
tox_env: calico
- job:
name: openstack-ansible-dragonflow-ubuntu-xenial
parent: openstack-ansible-functional-ubuntu-xenial
vars:
tox_env: dragonflow
- job:
name: openstack-ansible-opendaylight-ubuntu-xenial
parent: openstack-ansible-functional-ubuntu-xenial

2
zuul.d/project.yaml
View File

@ -26,8 +26,6 @@
- openstack-ansible-ovn-centos-7
- openstack-ansible-calico-ubuntu-xenial:
voting: false
- openstack-ansible-dragonflow-ubuntu-xenial:
voting: false
- openstack-ansible-opendaylight-ubuntu-xenial
- openstack-ansible-ovs-nsh-ubuntu-xenial
- openstack-ansible-odl-sfc-ubuntu-xenial