openstack/kolla
Code Issues Proposed changes

Fix Designate source image container assets

Browse Source 
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
This commit is contained in:
portdirect
2016-11-22 12:45:41 +00:00
parent 93f934c1d6
commit 4b0e4e06c1
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
docker/designate/designate-backend-bind9/Dockerfile.j2
View File

@@ -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 %}

14
docker/designate/designate-pool-manager/Dockerfile.j2
View File

@@ -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 %}