Merge "Revert "Run nodemgr process as contrail user (1/3)"" into R3.2

src/analytics/supervisord_analytics.conf

@@ -9,7 +9,7 @@
 [unix_http_server]
 file=/var/run/supervisord_analytics.sock    ; (the path to the socket file)
 chmod=0700                 ; socket file mode (default 0700)
-chown=contrail:contrail     ; socket file uid:gid owner
+;chown=nobody:nogroup       ; socket file uid:gid owner
 ;username=user              ; (default is no username (open server))
 ;password=123               ; (default is no password (open server))
 

src/config/api-server/supervisord_config.conf

@@ -9,7 +9,7 @@
 [unix_http_server]
 file=/var/run/supervisord_config.sock   ; (the path to the socket file)
 chmod=0700                 ; socket file mode (default 0700)
-chown=contrail:contrail     ; socket file uid:gid owner
+;chown=nobody:nogroup       ; socket file uid:gid owner
 ;username=user              ; (default is no username (open server))
 ;password=123               ; (default is no password (open server))
 

src/control-node/supervisord_control.conf

@@ -9,7 +9,7 @@
 [unix_http_server]
 file=/var/run/supervisord_control.sock   ; (the path to the socket file)
 chmod=0700                 ; socket file mode (default 0700)
-chown=contrail:contrail     ; socket file uid:gid owner
+;chown=nobody:nogroup       ; socket file uid:gid owner
 ;username=user              ; (default is no username (open server))
 ;password=123               ; (default is no password (open server))
 

src/nodemgr/analytics_nodemgr/contrail-analytics-nodemgr.ini

@@ -21,7 +21,6 @@ buffer_size=10000                ; event buffer queue size (default 10)
 ;stopwaitsecs=10               ; max num secs to wait b4 SIGKILL (default 10)
 ;stopasgroup=false             ; send stop signal to the UNIX process group (default false)
 ;killasgroup=false             ; SIGKILL the UNIX process group (def false)
-user=contrail                  ; setuid to this UNIX account to run the program
 ;redirect_stderr=true          ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/contrail/contrail-analytics-nodemgr-stdout.log        ; stdout log path, NONE for none; default AUTO
 ;stdout_logfile_maxbytes=1MB   ; max # logfile bytes b4 rotation (default 50MB)

src/nodemgr/config_nodemgr/contrail-config-nodemgr.ini

@@ -24,7 +24,6 @@ buffer_size=10000                ; event buffer queue size (default 10)
 ;stopwaitsecs=10               ; max num secs to wait b4 SIGKILL (default 10)
 ;stopasgroup=false             ; send stop signal to the UNIX process group (default false)
 ;killasgroup=false             ; SIGKILL the UNIX process group (def false)
-user=contrail                  ; setuid to this UNIX account to run the program
 ;redirect_stderr=true          ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/contrail/contrail-config-nodemgr-stdout.log       ; stdout log path, NONE for none; default AUTO
 ;stdout_logfile_maxbytes=1MB   ; max # logfile bytes b4 rotation (default 50MB)

src/nodemgr/control_nodemgr/contrail-control-nodemgr.ini

@@ -24,7 +24,6 @@ buffer_size=10000                ; event buffer queue size (default 10)
 ;stopwaitsecs=10               ; max num secs to wait b4 SIGKILL (default 10)
 ;stopasgroup=false             ; send stop signal to the UNIX process group (default false)
 ;killasgroup=false             ; SIGKILL the UNIX process group (def false)
-user=contrail                  ; setuid to this UNIX account to run the program
 ;redirect_stderr=true          ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/contrail/contrail-control-nodemgr-stdout.log ; stdout log path, NONE for none; default AUTO
 ;stdout_logfile_maxbytes=1MB   ; max # logfile bytes b4 rotation (default 50MB)

src/nodemgr/database_nodemgr/contrail-database-nodemgr.ini

@@ -23,7 +23,7 @@ buffer_size=10000                ; event buffer queue size (default 10)
 ;stopwaitsecs=10               ; max num secs to wait b4 SIGKILL (default 10)
 ;stopasgroup=false             ; send stop signal to the UNIX process group (default false)
 ;killasgroup=false             ; SIGKILL the UNIX process group (def false)
-user=contrail                  ; setuid to this UNIX account to run the program
+;user=chrism                   ; setuid to this UNIX account to run the program
 ;redirect_stderr=true          ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/contrail/contrail-database-nodemgr-stdout.log ; stdout log path, NONE for none; default AUTO
 ;stdout_logfile_maxbytes=1MB   ; max # logfile bytes b4 rotation (default 50MB)

src/nodemgr/vrouter_nodemgr/contrail-vrouter-nodemgr.ini

@@ -24,7 +24,7 @@ buffer_size=10000                ; event buffer queue size (default 10)
 ;stopwaitsecs=10               ; max num secs to wait b4 SIGKILL (default 10)
 ;stopasgroup=false             ; send stop signal to the UNIX process group (default false)
 ;killasgroup=false             ; SIGKILL the UNIX process group (def false)
-user=contrail                  ; setuid to this UNIX account to run the program
+;user=chrism                   ; setuid to this UNIX account to run the program
 ;redirect_stderr=true          ; redirect proc stderr to stdout (default false)
 stdout_logfile=/var/log/contrail/contrail-vrouter-nodemgr-stdout.log ; stdout log path, NONE for none; default AUTO
 ;stdout_logfile_maxbytes=1MB   ; max # logfile bytes b4 rotation (default 50MB)

src/vnsw/agent/supervisord_vrouter.conf

@@ -9,7 +9,7 @@
 [unix_http_server]
 file=/var/run/supervisord_vrouter.sock    ; (the path to the socket file)
 chmod=0700                 ; socket file mode (default 0700)
-chown=contrail:contrail     ; socket file uid:gid owner
+;chown=nobody:nogroup       ; socket file uid:gid owner
 ;username=user              ; (default is no username (open server))
 ;password=123               ; (default is no password (open server))