Skip to content

Commit

Permalink
Add ovs flows to skydive
Browse files Browse the repository at this point in the history
Skydive does not receive information about ovs flows
Fixed some other issue:
- Add logic to use skydive with odl
- Useless config folder.
- Missing auth parm in analyzer conf.
- Set internal endpoint for connection to keystone.
- Remove stderr which consumes a lot of disk space in the host.

Change-Id: I4f7287f7453a6c5b6b8d77d746281b175d421bed
Closes-Bug: #1711336
  • Loading branch information
xNaaro committed Oct 17, 2017
1 parent 1201ee0 commit bba8c8a
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
2 changes: 1 addition & 1 deletion ansible/roles/skydive/tasks/config.yml
@@ -1,7 +1,7 @@
---
- name: Ensuring config directories exist
file:
path: "{{ node_config_directory }}/{{ item.key }}/config"
path: "{{ node_config_directory }}/{{ item.key }}"
state: "directory"
recurse: yes
when:
Expand Down
13 changes: 10 additions & 3 deletions ansible/roles/skydive/templates/skydive-agent.conf.j2
Expand Up @@ -8,7 +8,6 @@ auth:
logging:
level: INFO
backends:
- stderr
- file
file:
path: /var/log/kolla/skydive/skydive-agent.log
Expand All @@ -20,6 +19,7 @@ openstack:
tenant_name: {{ openstack_auth['project_name'] }}
region_name: {{ openstack_region_name }}
domain_name: Default
endpoint_type: internal

etcd:
servers:
Expand All @@ -43,15 +43,15 @@ agent:
flow:
probes:
- gopacket
{% if neutron_plugin_agent == "openvswitch" %}
{% if neutron_plugin_agent in ['openvswitch', 'opendaylight'] %}
- ovssflow
{% endif %}
topology:
probes:
- netlink
- netns
- neutron
{% if neutron_plugin_agent == "openvswitch" %}
{% if neutron_plugin_agent in ['openvswitch', 'opendaylight'] %}
- ovsdb
{% endif %}

Expand All @@ -61,3 +61,10 @@ netns:
flow:
expire: 600
update: 60

{% if neutron_plugin_agent in ['openvswitch', 'opendaylight'] %}
ovs:
ovsdb: tcp://{{ api_interface_address }}:{{ ovsdb_port }}
oflow:
enable: true
{% endif %}
4 changes: 3 additions & 1 deletion ansible/roles/skydive/templates/skydive-analyzer.conf.j2
Expand Up @@ -2,11 +2,12 @@

auth:
type: keystone
analyzer_username: {{ openstack_auth['username'] }}
analyzer_password: {{ openstack_auth['password'] }}

logging:
level: INFO
backends:
- stderr
- file
file:
path: /var/log/kolla/skydive/skydive-analyzer.log
Expand All @@ -16,6 +17,7 @@ openstack:
tenant_name: {{ openstack_auth['project_name'] }}
region_name: {{ openstack_region_name }}
domain_name: Default
endpoint_type: internal

etcd:
client_timeout: 100
Expand Down

0 comments on commit bba8c8a

Please sign in to comment.