Merge "Skydive: allow access to netns for skydive agents"

This commit is contained in:
Jenkins 2017-08-21 08:19:50 +00:00 committed by Gerrit Code Review
commit 8d179f7f43
4 changed files with 7 additions and 0 deletions

View File

@ -16,10 +16,12 @@ skydive_services:
group: skydive-agent
enabled: true
image: "{{ skydive_agent_image_full }}"
privileged: True
volumes:
- "{{ node_config_directory }}/skydive-agent/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro"
- "/var/run/openvswitch/db.sock:/var/run/openvswitch/db.sock:ro"
- "/var/run/netns:/host/run:shared"
- "kolla_logs:/var/log/kolla/"
####################

View File

@ -32,6 +32,7 @@
common_options: "{{ docker_common_options }}"
name: "{{ service.container_name }}"
image: "{{ service.image }}"
privileged: "{{ service.privileged }}"
volumes: "{{ service.volumes }}"
when:
- action != "config"

View File

@ -41,6 +41,7 @@
common_options: "{{ docker_common_options }}"
name: "{{ item.value.container_name }}"
image: "{{ item.value.image }}"
privileged: "{{ item.value.privileged | default(False) }}"
volumes: "{{ item.value.volumes }}"
register: check_skydive_containers
when:

View File

@ -55,3 +55,6 @@ agent:
- ovsdb
{% endif %}
netns:
run_path: /host/run