diff options
| author | Zuul <zuul@review.openstack.org> | 2017-11-13 01:02:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-11-13 01:02:25 +0000 |
| commit | 920e9b375070317c0d28f32b7f1bdc5edcfc3a0e (patch) | |
| tree | fe989b0033608389642dc3453b36de525419fba5 /docker | |
| parent | 8e11ab68d9f306592c7638e148acddfdb91807d4 (diff) | |
| parent | ee7094c3745a36340092c7896abe7f36ec7f0973 (diff) | |
| download | kolla-920e9b375070317c0d28f32b7f1bdc5edcfc3a0e.tar.gz kolla-920e9b375070317c0d28f32b7f1bdc5edcfc3a0e.zip | |
Merge "Fix designate image build"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/designate/designate-base/Dockerfile.j2 | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/docker/designate/designate-base/Dockerfile.j2 b/docker/designate/designate-base/Dockerfile.j2 index 5b60dbdfb..7dabc7114 100644 --- a/docker/designate/designate-base/Dockerfile.j2 +++ b/docker/designate/designate-base/Dockerfile.j2 @@ -9,13 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - -# Install designate-api because of /etc/designate/policy.json, which -# is needed in all services. This is probably a packaging bug. We do -# need the complete policy file because of some of the containers' -# requiring it. Remove the package when the file is moved though. {% set designate_base_packages = [ - 'openstack-designate-api', 'openstack-designate-common', 'python-tooz', 'python2-oslo-reports', @@ -23,11 +17,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build ] %} {{ macros.install_packages(designate_base_packages | customizable("packages")) }} -RUN cp /etc/designate/policy.json /tmp/ \ - && rpm -e openstack-designate-api \ - && mv /tmp/policy.json /etc/designate/ \ - && chown designate: /etc/designate/policy.json - {% elif base_distro in ['debian', 'ubuntu'] %} {% set designate_base_packages = [ 'designate-common', |