Merge "Fixes odl username and sudoers permissions"

2017-06-07 08:54:32 +00:00
parent 65cbbfb049 1e17ae6bb1
commit 4b8b72bde0
2 changed files with 2 additions and 2 deletions
--- 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'] %}
--- 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,
    },