diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-06-07 08:54:32 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-06-07 08:54:32 +0000 |
| commit | 4b8b72bde0e6f43876d67b0e1b1f8d7b90593072 (patch) | |
| tree | 0e535c0f95d5be90e8502439f9f58e82b75e4ba4 | |
| parent | 65cbbfb0496e0a942a933366363fd8fab043b4f6 (diff) | |
| parent | 1e17ae6bb14daefccb3dfa5ce8758916994dce23 (diff) | |
| download | kolla-4b8b72bde0e6f43876d67b0e1b1f8d7b90593072.tar.gz kolla-4b8b72bde0e6f43876d67b0e1b1f8d7b90593072.zip | |
Merge "Fixes odl username and sudoers permissions"
| -rw-r--r-- | docker/opendaylight/Dockerfile.j2 | 2 | ||||
| -rwxr-xr-x | kolla/common/config.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/opendaylight/Dockerfile.j2 b/docker/opendaylight/Dockerfile.j2 index c01087967..5b6b9f46f 100644 --- a/docker/opendaylight/Dockerfile.j2 +++ b/docker/opendaylight/Dockerfile.j2 @@ -5,7 +5,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% import "macros.j2" as macros with context %} -{{ macros.configure_user(name='opendaylight') }} +{{ macros.configure_user(name='odl') }} {% if install_type == 'binary' %} {% set opendaylight_packages = ['opendaylight'] %} diff --git a/kolla/common/config.py b/kolla/common/config.py index 71bc941d2..017580114 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -844,7 +844,7 @@ USERS = { 'uid': 42461, 'gid': 42461, }, - 'opendaylight-user': { + 'odl-user': { 'uid': 42462, 'gid': 42462, }, |