openstack/kolla
Code Issues Proposed changes

Fix designate image build

Browse Source 
Designate implemented policy in code global goal.
This caused to policy.json is not present anymore.

Change-Id: Ib0b876019d4622f0c62429605c64d18a607b0320
This commit is contained in:
Eduardo Gonzalez 2017-11-08 20:31:00 +01:00
parent 61495b1a83
commit ee7094c374
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
docker/designate/designate-base/Dockerfile.j2
View File

@ -9,13 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% 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 = [ {% set designate_base_packages = [
'openstack-designate-api',
'openstack-designate-common', 'openstack-designate-common',
'python-tooz', 'python-tooz',
'python2-oslo-reports', 'python2-oslo-reports',
@ -23,11 +17,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %} ] %}
{{ macros.install_packages(designate_base_packages | customizable("packages")) }} {{ 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'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% set designate_base_packages = [ {% set designate_base_packages = [
'designate-common', 'designate-common',