From 003ff038d33b67c5bd63e9c54a6ba441c861b8c8 Mon Sep 17 00:00:00 2001
From: Michael Johnson <johnsomor@gmail.com>
Date: Tue, 12 Jan 2021 22:52:01 +0000
Subject: [PATCH] Create a container for Unbound DNS resolver

This patch sets up TripleO to create a container for the Unbound
DNS resolver. This will be used with Designate deployments to
provide DNS resolver services to the deployment and neutron.

Conflicts:
	container-images/tripleo_containers.yaml
	container-images/tripleo_containers.yaml.j2

Change-Id: Ifccee277393cc9ab095d1785216d3dacfbf3c5ce
(cherry picked from commit 96d3c1fa0613af6ce8fdef01d5f9d696da993aec)
---
 container-images/tcib/base/unbound/unbound.yaml | 5 +++++
 container-images/tripleo_containers.yaml        | 2 ++
 container-images/tripleo_containers.yaml.j2     | 8 ++++++++
 3 files changed, 15 insertions(+)
 create mode 100644 container-images/tcib/base/unbound/unbound.yaml

diff --git a/container-images/tcib/base/unbound/unbound.yaml b/container-images/tcib/base/unbound/unbound.yaml
new file mode 100644
index 000000000..33b3fd362
--- /dev/null
+++ b/container-images/tcib/base/unbound/unbound.yaml
@@ -0,0 +1,5 @@
+tcib_actions:
+- run: dnf -y install {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
+tcib_packages:
+  common:
+  - unbound
diff --git a/container-images/tripleo_containers.yaml b/container-images/tripleo_containers.yaml
index d0608621b..7193789f6 100644
--- a/container-images/tripleo_containers.yaml
+++ b/container-images/tripleo_containers.yaml
@@ -209,3 +209,5 @@ container_images:
   image_source: prom
 - imagename: quay.io/app-sre/grafana:5.2.4
   image_source: grafana
+- imagename: quay.io/tripleotrain/centos-binary-unbound:current-tripleo
+  image_source: tripleo
diff --git a/container-images/tripleo_containers.yaml.j2 b/container-images/tripleo_containers.yaml.j2
index b6c0dd773..6a743e98f 100644
--- a/container-images/tripleo_containers.yaml.j2
+++ b/container-images/tripleo_containers.yaml.j2
@@ -1006,3 +1006,11 @@ container_images_template:
   services:
   - OS::TripleO::Services::NovaConductor
 {% endif %}
+
+- imagename: "{{namespace}}/{{name_prefix}}unbound{{name_suffix}}:{{tag}}"
+  image_source: tripleo
+  params:
+  - ContainerUnboundImage
+  - ContainerUnboundConfigImage
+  services:
+  - OS::TripleO::Services::Unbound