aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerry Buteau <gerry.buteau@oracle.com>2018-03-21 11:24:02 -0400
committerGerry Buteau <gerry.buteau@oracle.com>2018-03-27 08:52:58 -0400
commitac2fe6cf5ce912dabba59fe71a7a623014d309e7 (patch)
tree36ff57cac60fbaaa51e77c57a7aee1242076fdc6
parent38f21c364bfd4633df39b144955bd991a0b0990d (diff)
downloadkolla-ac2fe6cf5ce912dabba59fe71a7a623014d309e7.tar.gz
kolla-ac2fe6cf5ce912dabba59fe71a7a623014d309e7.zip
Add support for Infoblox IPAM agent
The Infoblox IPAM agent will be started when 'infoblox' is configured as the pluggable IPAM driver in neutron. Change-Id: Ia44f0e0d7a0d60cebf0857ad51700e02eba5099b Partially-Implements: blueprint neutron-ipam-driver-infoblox
-rw-r--r--docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j211
-rwxr-xr-xkolla/common/config.py4
-rw-r--r--releasenotes/notes/add-neutron-ipam-driver-infoblox-0cee3c06f359c5e4.yaml7
3 files changed, 22 insertions, 0 deletions
diff --git a/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2 b/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2
new file mode 100644
index 000000000..bc7dd9764
--- /dev/null
+++ b/docker/neutron/neutron-infoblox-ipam-agent/Dockerfile.j2
@@ -0,0 +1,11 @@
+FROM {{ namespace }}/{{ image_prefix }}neutron-server:{{ tag }}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+
+{% block neutron_infoblox_ipam_agent_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{% block neutron_infoblox_ipam_agent_footer %}{% endblock %}
+{% block footer %}{% endblock %}
+
+USER neutron
diff --git a/kolla/common/config.py b/kolla/common/config.py
index 0a51f3c72..216d78d17 100755
--- a/kolla/common/config.py
+++ b/kolla/common/config.py
@@ -567,6 +567,10 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/networking-sfc/'
'networking-sfc-master.tar.gz')},
+ 'neutron-server-plugin-networking-infoblox': {
+ 'type': 'url',
+ 'location': ('$tarballs_base/networking-infoblox/'
+ 'networking-infoblox-master.tar.gz')},
'neutron-server-plugin-neutron-dynamic-routing': {
'type': 'url',
'location': ('$tarballs_base/neutron-dynamic-routing/'
diff --git a/releasenotes/notes/add-neutron-ipam-driver-infoblox-0cee3c06f359c5e4.yaml b/releasenotes/notes/add-neutron-ipam-driver-infoblox-0cee3c06f359c5e4.yaml
new file mode 100644
index 000000000..c467e7224
--- /dev/null
+++ b/releasenotes/notes/add-neutron-ipam-driver-infoblox-0cee3c06f359c5e4.yaml
@@ -0,0 +1,7 @@
+---
+features:
+ - |
+ Add Infoblox IPAM agent image. The agent will listen for
+ neutron and nova events and automatically manage DNS entries
+ within an Infoblox appliance. The agent will be started when
+ 'infoblox' is selected as the neutron_ipam_driver.