diff options
| author | Eduardo Gonzalez <dabarren@gmail.com> | 2017-11-08 20:31:00 +0100 |
|---|---|---|
| committer | Eduardo Gonzalez <dabarren@gmail.com> | 2017-11-08 20:31:00 +0100 |
| commit | ee7094c3745a36340092c7896abe7f36ec7f0973 (patch) | |
| tree | e9dc21d3d9e2f3c295939065335745ef91d239ad /docker | |
| parent | 61495b1a8303e52f58cc4d8970c2d484b5f31520 (diff) | |
| download | kolla-ee7094c3745a36340092c7896abe7f36ec7f0973.tar.gz kolla-ee7094c3745a36340092c7896abe7f36ec7f0973.zip | |
Fix designate image build
Designate implemented policy in code global goal.
This caused to policy.json is not present anymore.
Change-Id: Ib0b876019d4622f0c62429605c64d18a607b0320
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', |