openstack
/
magnum
Code Issues Proposed changes

Merge heat-kubernetes pull request 15 

This changes the adding of the docker user to dockerroot to match
the changes to fedora.

See:
https://github.com/larsks/heat-kubernetes/pull/15/

Change-Id: I54f2567d487ffdb4108439438ffd64c0334d1f8b
loses-bug: #1434468
This commit is contained in:
Steven Dake 2015-03-22 20:59:23 -07:00
parent e6e86f7163
commit 20bf6ed1cf
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
magnum/templates/heat-kubernetes/fragments/add-to-docker-group.sh
View File

@ -1,14 +1,14 @@
#!/bin/sh
# Under atomic, we need to make sure the 'docker' group exists in
# Under atomic, we need to make sure the 'dockerroot' group exists in
# /etc/group (because /lib/group cannot be modified by usermod).
echo "making 'docker' group editable"
if ! grep -q docker /etc/group; then
grep docker /lib/group >> /etc/group
echo "making 'dockerroot' group editable"
if ! grep -q dockerroot /etc/group; then
grep dockerroot /lib/group >> /etc/group
fi
# make 'minion' user a member of the docker group
# make 'minion' user a member of the dockerroot group
# (so you can run docker commands as the 'minion' user)
echo "adding 'minion' user to 'docker' group"
usermod -G docker minion
echo "adding 'minion' user to 'dockerroot' group"
usermod -G dockerroot minion