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/glance | |
| 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/glance')
| -rw-r--r-- | docker/glance/glance-api/extend_start.sh | 1 | ||||
| -rw-r--r-- | docker/glance/glance-base/Dockerfile.j2 | 5 | ||||
| -rw-r--r-- | docker/glance/glance-base/glance_sudoers | 1 |
3 files changed, 1 insertions, 6 deletions
diff --git a/docker/glance/glance-api/extend_start.sh b/docker/glance/glance-api/extend_start.sh index be4b83961..3d8d7f512 100644 --- a/docker/glance/glance-api/extend_start.sh +++ b/docker/glance/glance-api/extend_start.sh @@ -5,6 +5,5 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then glance-manage db_sync glance-manage db_load_metadefs - sudo chown -R glance: /var/lib/glance/ exit 0 fi diff --git a/docker/glance/glance-base/Dockerfile.j2 b/docker/glance/glance-base/Dockerfile.j2 index e0d3b8224..ec2204cda 100644 --- a/docker/glance/glance-base/Dockerfile.j2 +++ b/docker/glance/glance-base/Dockerfile.j2 @@ -49,12 +49,9 @@ RUN ln -s glance-base-source/* glance \ {% endif %} -COPY glance_sudoers /etc/sudoers.d/kolla_glance_sudoers COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 750 /etc/sudoers.d \ - && chmod 440 /etc/sudoers.d/kolla_glance_sudoers \ - && touch /usr/local/bin/kolla_glance_extend_start \ +RUN touch /usr/local/bin/kolla_glance_extend_start \ && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_glance_extend_start {% block glance_base_footer %}{% endblock %} diff --git a/docker/glance/glance-base/glance_sudoers b/docker/glance/glance-base/glance_sudoers deleted file mode 100644 index ffb536abf..000000000 --- a/docker/glance/glance-base/glance_sudoers +++ /dev/null @@ -1 +0,0 @@ -%kolla ALL=(root) NOPASSWD: /usr/bin/chown -R glance\: /var/lib/glance/, /bin/chown -R glance\: /var/lib/glance/ |