From 2b1286aaae1dac2c11124a3dd1df4147c035b1ce Mon Sep 17 00:00:00 2001 From: Zuul Date: Fri, 17 Jan 2020 05:15:40 +0000 Subject: [PATCH] Update git submodules * Update puppet-tripleo from branch 'master' - Merge "Make the bundle user configurable via hiera" - Make the bundle user configurable via hiera Allow all bundles --user option to be overridden as some of them might prefer switching to a non-root user when possible. The ovn-dbs bundle is a bit special because it never specified any user. Hence we default that user to undef and do not set anything. Tested as follows: 1. deployed an overcloud 2. patched it with this change 3. redeployed and and then observed that no HA container has restarted at all 4. verified cinder-volume runs with root by default: USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND root 1 0.0 0.0 4204 716 ? Ss 09:01 0:00 dumb-init --single-child -- /bin/bash /usr/local/bin/kolla_start root 7 0.7 0.7 912976 145760 ? S 09:01 1:04 /usr/bin/python3 /usr/bin/cinder-volume --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf root 71 0.1 0.6 925800 124640 ? S 09:01 0:14 /usr/bin/python3 /usr/bin/cinder-volume --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf 5. added 'tripleo::profile::pacemaker::cinder::volume_bundle::bundle_user: cinder' to the templates and redeployed 6. Observed that cinder-volume got restarted and now runs with cinder user: USER PID %CPU %MEM VSZ RSS TTY STAT START TIME COMMAND cinder 1 0.0 0.0 4204 804 ? Ss 12:23 0:00 dumb-init --single-child -- /bin/bash /usr/local/bin/kolla_start cinder 7 2.1 0.7 912976 145432 ? S 12:23 0:04 /usr/bin/python3 /usr/bin/cinder-volume --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf cinder 64 0.3 0.5 919908 118452 ? S 12:23 0:00 /usr/bin/python3 /usr/bin/cinder-volume --config-file /usr/share/cinder/cinder-dist.conf --config-file /etc/cinder/cinder.conf Change-Id: I985d0d192ef3accf7fdd31503348de80713fded4 --- puppet-tripleo | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/puppet-tripleo b/puppet-tripleo index 0a64eebb64..8c0d43a193 160000 --- a/puppet-tripleo +++ b/puppet-tripleo @@ -1 +1 @@ -Subproject commit 0a64eebb6454483e823c4cf12c55832935c2319f +Subproject commit 8c0d43a193d60214d8615a88334c94ee683ff13a