openstack/kolla-ansible
Code Issues Proposed changes

Merge "Customizations for keepalived"

Browse Source
This commit is contained in:
Jenkins 2016-08-05 05:54:30 +00:00 committed by Gerrit Code Review
commit 67e77035b8
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
docker/keepalived/Dockerfile.j2
View File

@ -1,26 +1,26 @@
FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }} FROM {{ namespace }}/{{ image_prefix }}base:{{ tag }}
MAINTAINER {{ maintainer }} MAINTAINER {{ maintainer }}
{% import "macros.j2" as macros with context %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set keepalived_packages = [
RUN yum -y install \ 'hostname',
hostname \ 'keepalived',
keepalived \ 'socat'
socat \ ] %}
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %} {% elif base_distro in ['ubuntu', 'debian'] %}
{% set keepalived_packages = [
RUN apt-get -y install --no-install-recommends \ 'keepalived',
keepalived \ 'socat'
socat \ ] %}
&& apt-get clean
{% endif %} {% endif %}
RUN {{ macros.install_packages(keepalived_packages | customizable("packages")) }}
COPY check_alive.sh / COPY check_alive.sh /
COPY extend_start.sh /usr/local/bin/kolla_extend_start COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN chmod 755 /usr/local/bin/kolla_extend_start /check_alive.sh RUN chmod 755 /usr/local/bin/kolla_extend_start /check_alive.sh
{% block keepalived_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }} {{ include_footer }}