openstack/kolla-ansible
Code Issues Proposed changes

Merge "remove override_install_langs option in /etc/yum.conf"

Browse Source
This commit is contained in:
Jenkins 2016-11-06 19:54:18 +00:00 committed by Gerrit Code Review
commit 1f01ef37a4
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/base/Dockerfile.j2
View File

@ -29,7 +29,8 @@ ENV PS1="$(tput bold)($(printenv KOLLA_SERVICE_NAME))$(tput sgr0)[$(id -un)@$(ho
RUN if [ $(awk '{match($0, /[0-9]+/,version)}END{print version[0]}' /etc/system-release) != "{{ supported_distro_release }}" ]; then \ RUN if [ $(awk '{match($0, /[0-9]+/,version)}END{print version[0]}' /etc/system-release) != "{{ supported_distro_release }}" ]; then \
echo "Only supported {{ supported_distro_release }} release on {{ base_distro }}"; false; \ echo "Only supported {{ supported_distro_release }} release on {{ base_distro }}"; false; \
fi \ fi \
&& cat /tmp/kolla_bashrc >> /etc/bashrc && cat /tmp/kolla_bashrc >> /etc/bashrc \
&& sed -i 's|^\(override_install_langs=.*\)|# \1|' /etc/yum.conf
#### BEGIN REPO ENABLEMENT #### BEGIN REPO ENABLEMENT
# Turns on Elasticsearch repos # Turns on Elasticsearch repos