From 767e9ceccfb8bc47c02283cb46347b8b21e6d067 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Mon, 15 Jan 2018 15:39:21 -0600 Subject: [PATCH] Fix LBaaSv2 config and package requirements The LBaaSv2 (not Octavia) requires the net-utils(tools) package to function. Additionally the user_group needs to be set to an OS specific value. This change adds a default allowing the user to override the new option `neutron_lbaasv2_user_group` as needed but the default will be inherited from the os specific variable file. Change-Id: Ic4b9461e369f1db94dfcfc3cebae034b3d38bb09 Signed-off-by: Kevin Carter --- defaults/main.yml | 3 +++ releasenotes/notes/lbaasv2-options-ae992286abfa689f.yaml | 5 +++++ templates/lbaas_agent.ini.j2 | 2 +- vars/redhat-7.yml | 2 ++ vars/suse-42.yml | 2 ++ vars/ubuntu-16.04.yml | 2 ++ 6 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/lbaasv2-options-ae992286abfa689f.yaml diff --git a/defaults/main.yml b/defaults/main.yml index 554d3790..97960e7d 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -102,6 +102,9 @@ neutron_dns_domain: "openstacklocal." neutron_dhcp_config: log-facility: "/var/log/neutron/neutron-dnsmasq.log" +# Set the neutron lbaasv2 user group, defaults from os specific vars +neutron_lbaasv2_user_group: "{{ _neutron_lbaasv2_user_group }}" + ### ### Tunable Overrides (Sorted alphabetically) ### diff --git a/releasenotes/notes/lbaasv2-options-ae992286abfa689f.yaml b/releasenotes/notes/lbaasv2-options-ae992286abfa689f.yaml new file mode 100644 index 00000000..824df227 --- /dev/null +++ b/releasenotes/notes/lbaasv2-options-ae992286abfa689f.yaml @@ -0,0 +1,5 @@ +--- +features: + - An option has been added allowing the user to define the `user_group` + LBaaSv2 uses. The new option is ``neutron_lbaasv2_user_group`` and + is set within the OS specific value by default. diff --git a/templates/lbaas_agent.ini.j2 b/templates/lbaas_agent.ini.j2 index 24656297..43081c0a 100644 --- a/templates/lbaas_agent.ini.j2 +++ b/templates/lbaas_agent.ini.j2 @@ -29,7 +29,7 @@ device_driver = {{ neutron_lbaasv2_device_driver }} # loadbalancer_state_path = $state_path/lbaas # The user group -user_group = nogroup +user_group = {{ neutron_lbaasv2_user_group }} # When delete and re-add the same vip, send this many gratuitous ARPs to flush # the ARP cache in the Router. Set it below or equal to 0 to disable this feature. diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml index 42885932..05977e62 100644 --- a/vars/redhat-7.yml +++ b/vars/redhat-7.yml @@ -30,6 +30,7 @@ neutron_distro_packages: - iptables - iputils - keepalived + - net-tools - radvd - which @@ -49,3 +50,4 @@ neutron_remove_distro_packages: [] neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf" neutron_lbaasv2_agent_servicename: "neutron-lbaasv2-agent" +_neutron_lbaasv2_user_group: haproxy diff --git a/vars/suse-42.yml b/vars/suse-42.yml index 12422338..c237caac 100644 --- a/vars/suse-42.yml +++ b/vars/suse-42.yml @@ -41,6 +41,7 @@ neutron_distro_packages: - iptables - iputils - keepalived + - net-tools - radvd - which @@ -60,3 +61,4 @@ neutron_remove_distro_packages: [] neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf" neutron_lbaasv2_agent_servicename: "neutron-lbaasv2-agent" +_neutron_lbaasv2_user_group: nogroup diff --git a/vars/ubuntu-16.04.yml b/vars/ubuntu-16.04.yml index b7a34910..a9fe9dc1 100644 --- a/vars/ubuntu-16.04.yml +++ b/vars/ubuntu-16.04.yml @@ -38,6 +38,7 @@ neutron_distro_packages: - ipset - iptables - iputils-arping + - net-tools - keepalived - radvd @@ -58,3 +59,4 @@ neutron_remove_distro_packages: neutron_lbaasv2_initscript_path: "/etc/init/neutron-lbaasv2-agent.conf" neutron_lbaasv2_agent_servicename: "neutron-lbaasv2-agent" +_neutron_lbaasv2_user_group: nogroup