openstack/kolla-ansible
Code Issues Proposed changes

change the mode for sudoers file

Browse Source 
vmtp and grafana are configured in wrong.

TrivialFix

Change-Id: Ib7eab9ae6d433328772da450bb7a9b2a5e2554ee
This commit is contained in:
Jeffrey Zhang 2016-11-04 14:01:46 +08:00
parent d25ddf87f3
commit 69f980b86d
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/grafana/Dockerfile.j2
View File

@ -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
View File

@ -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 %}