diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-07-06 19:18:10 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-07-06 19:18:10 +0000 |
| commit | 5c2c0a9c2b42150e6ce84a536e3b2b1be51d7297 (patch) | |
| tree | c769916ed3d7e0b8216ad65da7a9474a79a05ffc /docker/ceilometer | |
| parent | a459a29433d6fb274843ce43dd3b5719bf419c5d (diff) | |
| parent | 3f79e37d21f7bda40656da2d9607cb4fe0c2c69a (diff) | |
| download | kolla-5c2c0a9c2b42150e6ce84a536e3b2b1be51d7297.tar.gz kolla-5c2c0a9c2b42150e6ce84a536e3b2b1be51d7297.zip | |
Merge "Fix the overwrite sudoers file issue"
Diffstat (limited to 'docker/ceilometer')
| -rw-r--r-- | docker/ceilometer/ceilometer-base/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 2d6825497..a14a290a8 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -31,11 +31,11 @@ RUN ln -s ceilometer-base-source/* ceilometer \ {% endif %} -COPY ceilometer_sudoers /etc/sudoers.d/ceilometer_sudoers +COPY ceilometer_sudoers /etc/sudoers.d/kolla_ceilometer_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start RUN usermod -a -G kolla ceilometer \ && chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/ceilometer_sudoers \ + && chmod 440 /etc/sudoers.d/kolla_ceilometer_sudoers \ && touch /usr/local/bin/kolla_ceilometer_extend_start \ && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_ceilometer_extend_start |