From 4b0e4e06c192a7409203518eaa85670d60bd258d Mon Sep 17 00:00:00 2001 From: portdirect Date: Tue, 22 Nov 2016 12:45:41 +0000 Subject: Fix Designate source image container assets When building Desginate from source, the require binaries were not included, this commit addresses that issue by installing them regardless of the build type. Change-Id: I05d11ce8289a6f201311b556d2b43b373c90cd64 Closes-Bug: #1642995 --- docker/designate/designate-backend-bind9/Dockerfile.j2 | 10 ++++------ docker/designate/designate-pool-manager/Dockerfile.j2 | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/docker/designate/designate-backend-bind9/Dockerfile.j2 b/docker/designate/designate-backend-bind9/Dockerfile.j2 index 83aa68c73..eb9adeab9 100644 --- a/docker/designate/designate-backend-bind9/Dockerfile.j2 +++ b/docker/designate/designate-backend-bind9/Dockerfile.j2 @@ -5,20 +5,18 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} -{% if install_type == 'binary' %} - {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - {% set designate_backend_bind9_packages = ['bind'] %} +{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set designate_backend_bind9_packages = ['bind'] %} {{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }} RUN mkdir -p /var/lib/kolla/ \ && cp -pr /var/named /var/lib/kolla/var-named - {% elif base_distro in ['ubuntu'] %} - {% set designate_backend_bind9_packages = ['bind9'] %} +{% elif base_distro in ['ubuntu'] %} + {% set designate_backend_bind9_packages = ['bind9'] %} {{ macros.install_packages(designate_backend_bind9_packages | customizable("packages")) }} - {% endif %} {% endif %} {% block designate_backend_bind9_footer %}{% endblock %} diff --git a/docker/designate/designate-pool-manager/Dockerfile.j2 b/docker/designate/designate-pool-manager/Dockerfile.j2 index 4b9ca6f26..14a4f9e4c 100644 --- a/docker/designate/designate-pool-manager/Dockerfile.j2 +++ b/docker/designate/designate-pool-manager/Dockerfile.j2 @@ -5,9 +5,9 @@ MAINTAINER {{ maintainer }} {% import "macros.j2" as macros with context %} +# The bind9 package here is only to provide the rndc binary. {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} -# The bind9 package here is only to provide the rndc binary. {% set designate_pool_manager_packages = [ 'bind', 'openstack-designate-pool-manager' @@ -18,8 +18,18 @@ MAINTAINER {{ maintainer }} 'designate-pool-manager' ] %} {% endif %} -{{ macros.install_packages(designate_pool_manager_packages | customizable("packages")) }} +{% elif install_type == 'source' %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set designate_pool_manager_packages = [ + 'bind' + ] %} + {% elif base_distro in ['ubuntu'] %} + {% set designate_pool_manager_packages = [ + 'bind9' + ] %} + {% endif %} {% endif %} +{{ macros.install_packages(designate_pool_manager_packages | customizable("packages")) }} {% block designate_pool_manager_footer %}{% endblock %} {% block footer %}{% endblock %} -- cgit v1.2.3