diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-11-23 12:22:41 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-11-23 12:22:41 +0000 |
| commit | 0cef44fc9ac4a51e89cb0d4f402335592167353f (patch) | |
| tree | 0ff74954b55ae1d05e67cb5604b867e3da2241ba /docker | |
| parent | e1ec29bdb2cf5cf674f73b98be1571cf0a50a98b (diff) | |
| parent | 4b0e4e06c192a7409203518eaa85670d60bd258d (diff) | |
| download | kolla-0cef44fc9ac4a51e89cb0d4f402335592167353f.tar.gz kolla-0cef44fc9ac4a51e89cb0d4f402335592167353f.zip | |
Merge "Fix Designate source image container assets"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/designate/designate-backend-bind9/Dockerfile.j2 | 10 | ||||
| -rw-r--r-- | 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 %} |