diff options
| author | Zuul <zuul@review.openstack.org> | 2018-03-16 09:42:21 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2018-03-16 09:42:21 +0000 |
| commit | c251ee671b1d3f80b728779b8b9603f3cd7cb962 (patch) | |
| tree | 6b992b6a2f8765bb00ecf7dada86f57fae43604a /docker | |
| parent | cdfd2e5eccb2661649a845d98e7e660c49033e5c (diff) | |
| parent | 78e3aa2c751289808cb5a2b03803b19e95c810f3 (diff) | |
| download | kolla-c251ee671b1d3f80b728779b8b9603f3cd7cb962.tar.gz kolla-c251ee671b1d3f80b728779b8b9603f3cd7cb962.zip | |
Merge "Skydive: install openvswitch client to fetch OpenFlow rules"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/skydive/skydive-agent/Dockerfile.j2 | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/docker/skydive/skydive-agent/Dockerfile.j2 b/docker/skydive/skydive-agent/Dockerfile.j2 index 50708e13a..204aacead 100644 --- a/docker/skydive/skydive-agent/Dockerfile.j2 +++ b/docker/skydive/skydive-agent/Dockerfile.j2 @@ -3,5 +3,16 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% block skydive_agent_header %}{% endblock %} +{% import "macros.j2" as macros with context %} + +{% block skydive_agent_install %} +{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set skydive_agent_packages = ['openvswitch'] %} +{% elif base_distro in ['debian', 'ubuntu'] %} + {% set skydive_agent_packages = ['openvswitch-common'] %} +{% endif %} +{{ macros.install_packages(skydive_agent_packages | customizable("packages")) }} +{% endblock %} + {% block skydive_agent_footer %}{% endblock %} {% block footer %}{% endblock %} |
