Merge "Run the ovn-bgp-agent with user ovn-bgp instead of neutron" in…

…to stable/wallaby
openstack-archive · Mar 24, 2022 · 0c754c6 · 0c754c6
2 parents da4a8cb + 9a7d56f
commit 0c754c6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/container-images/kolla/base/uid_gid_manage.sh b/container-images/kolla/base/uid_gid_manage.sh
@@ -63,6 +63,7 @@ _SUPPORTED_USERS['nova']='nova 42436 42436 /var/lib/nova qemu,libvirt,kolla'
 _SUPPORTED_USERS['novajoin']='novajoin 42470 42470 /var/lib/novajoin kolla'
 _SUPPORTED_USERS['octavia']='octavia 42437 42437 /var/lib/octavia kolla'
 _SUPPORTED_USERS['openvswitch']='openvswitch 42476 42476'
+_SUPPORTED_USERS['ovn-bgp']='ovn-bgp 42486 42486 /var/lib/ovn-bgp kolla'
 _SUPPORTED_USERS['placement']='placement 42482 42482 /var/lib/placement kolla'
 _SUPPORTED_USERS['qdrouterd']='qdrouterd 42465 42465 /var/lib/qdrouterd kolla'
 _SUPPORTED_USERS['qemu']='qemu 107 107'

diff --git a/container-images/tcib/base/ovn-bgp-agent/ovn_bgp_agent.yaml b/container-images/tcib/base/ovn-bgp-agent/ovn_bgp_agent.yaml
@@ -1,8 +1,8 @@
 tcib_actions:
-- run: bash /usr/local/bin/uid_gid_manage neutron
+- run: bash /usr/local/bin/uid_gid_manage ovn-bgp
 - run: dnf install -y {{ tcib_packages['common'] | join(' ') }} && dnf clean all && rm -rf /var/cache/dnf
 - run: ln -s /usr/share/openstack-tripleo-common/healthcheck/ovn-bgp-agent /openstack/healthcheck && chmod a+rx /openstack/healthcheck
 tcib_packages:
   common:
   - ovn-bgp-agent
-tcib_user: neutron
+tcib_user: ovn-bgp