From 69f980b86dfd09f23aa7e0644b1d1c47338dd4fc Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Fri, 4 Nov 2016 14:01:46 +0800
Subject: [PATCH] change the mode for sudoers file
vmtp and grafana are configured in wrong.
TrivialFix
Change-Id: Ib7eab9ae6d433328772da450bb7a9b2a5e2554ee
---
docker/grafana/Dockerfile.j2 | 8 +++++---
docker/vmtp/Dockerfile.j2 | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/docker/grafana/Dockerfile.j2 b/docker/grafana/Dockerfile.j2
index 7d03bcd49f..ba54e144c8 100644
--- a/docker/grafana/Dockerfile.j2
+++ b/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 }}
diff --git a/docker/vmtp/Dockerfile.j2 b/docker/vmtp/Dockerfile.j2
index 3bc1cc53e5..b750791316 100644
--- a/docker/vmtp/Dockerfile.j2
+++ b/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 %}