diff options
| author | Steven Dake <stdake@cisco.com> | 2017-05-26 21:33:17 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2017-05-26 21:40:31 -0700 |
| commit | 4607ab5e530310c9f3b5bf35490c40d087340d07 (patch) | |
| tree | 05497840d797a9dfc466635b8a98cb45f23082f1 /docker/rabbitmq | |
| parent | 7a9160f3f3eb394ead52ebd1861329db1d8a6868 (diff) | |
| download | kolla-4607ab5e530310c9f3b5bf35490c40d087340d07.tar.gz kolla-4607ab5e530310c9f3b5bf35490c40d087340d07.zip | |
Remove sudo operations that are no longer necessary
set_configs.py has logic to handle chown of directories. Simplify
the codebase by removing these unnessary chowns. Further the chowns
cause some forms of NFS backed storage to not work properly.
Change-Id: I8df95d06b1010778deb3e2a3065aaab26ed2eb6a
Closes-Bug: #1693973
Diffstat (limited to 'docker/rabbitmq')
| -rw-r--r-- | docker/rabbitmq/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/rabbitmq/extend_start.sh | 1 | ||||
| -rw-r--r-- | docker/rabbitmq/rabbitmq_sudoers | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/docker/rabbitmq/Dockerfile.j2 b/docker/rabbitmq/Dockerfile.j2 index 118b04087..054a63a31 100644 --- a/docker/rabbitmq/Dockerfile.j2 +++ b/docker/rabbitmq/Dockerfile.j2 @@ -45,11 +45,8 @@ RUN rm -rf /var/lib/rabbitmq/* \ {% endblock %} COPY extend_start.sh /usr/local/bin/kolla_extend_start -COPY rabbitmq_sudoers /etc/sudoers.d/kolla_rabbitmq_sudoers COPY rabbitmq_get_gospel_node.py /usr/local/bin/rabbitmq_get_gospel_node -RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/rabbitmq_get_gospel_node \ - && chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_rabbitmq_sudoers +RUN chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/rabbitmq_get_gospel_node {% block rabbitmq_footer %}{% endblock %} {% block footer %}{% endblock %} diff --git a/docker/rabbitmq/extend_start.sh b/docker/rabbitmq/extend_start.sh index 56d06aaf9..7aa685e82 100644 --- a/docker/rabbitmq/extend_start.sh +++ b/docker/rabbitmq/extend_start.sh @@ -3,7 +3,6 @@ # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then - sudo chown -R rabbitmq: /var/lib/rabbitmq # NOTE(sbezverk): In kubernetes environment, if this file exists from previous # bootstrap, the system does not allow to overwrite it (it bootstrap files with diff --git a/docker/rabbitmq/rabbitmq_sudoers b/docker/rabbitmq/rabbitmq_sudoers deleted file mode 100644 index 7d3d091d8..000000000 --- a/docker/rabbitmq/rabbitmq_sudoers +++ /dev/null @@ -1 +0,0 @@ -%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R rabbitmq\: /var/lib/rabbitmq, /bin/chown -R rabbitmq\: /var/lib/rabbitmq |