openstack/kolla-ansible
Code Issues Proposed changes

Merge "change the mode for sudoers file"

Browse Source
This commit is contained in:
Jenkins 2016-11-04 15:46:04 +00:00 committed by Gerrit Code Review
commit 6dd2a7d029
2 changed files with 6 additions and 4 deletions

8
docker/grafana/Dockerfile.j2

@ -8,14 +8,16 @@ MAINTAINER {{ maintainer }}
{% set grafana_packages = ['grafana'] %}
{{ macros.install_packages(grafana_packages | customizable("packages")) }}
RUN usermod -a -G kolla grafana \
&& grafana-cli plugins install sileht-gnocchi-datasource
WORKDIR /usr/share/grafana
COPY grafana_sudoers /etc/sudoers.d/kolla_grafana_sudoers
COPY extend_start.sh /usr/local/bin/kolla_extend_start
RUN grafana-cli plugins install sileht-gnocchi-datasource \
&& chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_grafana_sudoers \
&& usermod -a -G kolla grafana
{% block grafana_footer %}{% endblock %}
{% block footer %}{% endblock %}
{{ include_footer }}

2
docker/vmtp/Dockerfile.j2

@ -17,7 +17,7 @@ RUN pip install vmtp \
COPY vmtp_sudoers /etc/sudoers.d/kolla_vmtp_sudoers
RUN chmod 750 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d \
&& chmod 440 /etc/sudoers.d/kolla_vmtp_sudoers \
&& usermod -a -G kolla vmtp
{% block vmtp_footer %}{% endblock %}