Merge "Add Dockerfile for networking-ovn-metadata-agent"

This commit is contained in:
Zuul 2017-12-12 23:22:10 +00:00 committed by Gerrit Code Review
commit d353da2097
3 changed files with 49 additions and 0 deletions

View File

@ -0,0 +1,39 @@
FROM {{ namespace }}/{{ image_prefix }}neutron-base:{{ tag }}
LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
{% block neutron_metadata_agent_ovn_header %}{% endblock %}
{% import "macros.j2" as macros with context %}
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
{% set neutron_metadata_agent_ovn_packages = [
'python-networking-ovn-metadata-agent'
] %}
{% elif base_distro in ['debian', 'ubuntu'] %}
{% set neutron_metadata_agent_ovn_packages = [
'python-networking-ovn'
] %}
{% endif %}
{{ macros.install_packages(neutron_metadata_agent_ovn_packages | customizable("packages")) }}
{% elif install_type == 'source' %}
ADD plugins-archive /
{% set neutron_metadata_agent_ovn_plugins_pip_packages = [
'/plugins/*'
] %}
RUN if [ "$(ls /plugins)" ]; then \
{{ macros.install_pip(neutron_metadata_agent_ovn_plugins_pip_packages | customizable("pip_packages")) }}; \
fi
{% endif %}
{% block neutron_metadata_agent_ovn_footer %}{% endblock %}
{% block footer %}{% endblock %}
USER neutron

View File

@ -571,6 +571,10 @@ SOURCES = {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/networking-ovn/' 'location': ('$tarballs_base/networking-ovn/'
'networking-ovn-master.tar.gz')}, 'networking-ovn-master.tar.gz')},
'neutron-metadata-agent-ovn-plugin-networking-ovn': {
'type': 'url',
'location': ('$tarballs_base/networking-ovn/'
'networking-ovn-master.tar.gz')},
'nova-base': { 'nova-base': {
'type': 'url', 'type': 'url',
'location': ('$tarballs_base/nova/' 'location': ('$tarballs_base/nova/'

View File

@ -0,0 +1,6 @@
---
features:
- |
A new agent for metadata API has been introduced in ``networking-ovn``.
This agent is to be deployed in compute nodes and, in order to support
a containerized deployment, a new Kolla image is created.