From 0d34dade14068a850c8a0d4ed600daf16a978dd1 Mon Sep 17 00:00:00 2001 From: Logan V Date: Sat, 13 Apr 2019 18:58:56 -0500 Subject: [PATCH] Fix calico service unit user/group The wrong vars were being passed to systemd_service, so the agents were being run as neutron/neutron instead of root/root. Change-Id: I9f7b046b85203da20f022b6ee959290485b6aabd --- vars/main.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vars/main.yml b/vars/main.yml index 952997e1..a8aa4c76 100644 --- a/vars/main.yml +++ b/vars/main.yml @@ -444,8 +444,8 @@ neutron_services: start_order: 1 calico-felix: group: neutron_calico_dhcp_agent - system_user: root - system_group: root + systemd_user_name: root + systemd_group_name: root service_name: calico-felix service_en: "{{ neutron_plugin_type == 'ml2.calico' }}" service_conf_path: /etc/calico @@ -457,8 +457,8 @@ neutron_services: start_order: 3 calico-dhcp-agent: group: neutron_calico_dhcp_agent - system_user: root - system_group: root + systemd_user_name: root + systemd_group_name: root service_name: calico-dhcp-agent service_en: "{{ neutron_plugin_type == 'ml2.calico' }}" service_rootwrap: rootwrap.d/dhcp.filters