From 4918c7fcd13d924fe2beb14cc7b0471a66b998e8 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Fri, 1 Jul 2016 11:19:14 -0500 Subject: [PATCH] Deprecate the deployment of the AT&T neutron HA tool The AT&T neutron HA tool has been deprecated and will not be deployed by default. It is no longer is the correct means to enable L3HA within an OpenStack environment. Change-Id: I3f9aeb554d153ef3aa1db9a1037c7d57a45968b0 Signed-off-by: Kevin Carter --- defaults/main.yml | 4 ++++ .../removed-neutron-ha-tool-dd7a4717e03163f9.yaml | 13 +++++++++++++ tasks/main.yml | 5 +++-- tasks/neutron_l3_ha.yml | 10 ---------- 4 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 releasenotes/notes/removed-neutron-ha-tool-dd7a4717e03163f9.yaml diff --git a/defaults/main.yml b/defaults/main.yml index 7b76d25d..9f06e76e 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -229,6 +229,10 @@ neutron_lbaasv2: "{% if 'lbaasv2' in neutron_plugin_base or 'neutron_lbaas.servi #TODO(odyssey4me): Remove the class path from this conditional in the Newton cycle neutron_l3: "{% if 'router' in neutron_plugin_base or 'neutron.services.l3_router.l3_router_plugin.L3RouterPlugin' in neutron_plugin_base %}True{% else %}False{% endif %}" +# Set this option to "true" to enable legacy neutron L3HA tool support +# TODO(cloudnull): Remove this in the Ocata cycle +neutron_legacy_ha_tool_enabled: false + ## Neutron Metering # Please add 'metering' to the neutron_plugin_base list #TODO(odyssey4me): Remove the class path from this conditional in the Newton cycle diff --git a/releasenotes/notes/removed-neutron-ha-tool-dd7a4717e03163f9.yaml b/releasenotes/notes/removed-neutron-ha-tool-dd7a4717e03163f9.yaml new file mode 100644 index 00000000..70eb3386 --- /dev/null +++ b/releasenotes/notes/removed-neutron-ha-tool-dd7a4717e03163f9.yaml @@ -0,0 +1,13 @@ +--- +deprecations: + - The Neutron HA tool written by AT&T has been deprecated and will be + removed in the Ocata release. +upgrade: + - The Neutron HA tool written by AT&T is no longer enabled by default. + This tool was providing HA capabilities for networks and routers + that were not using the native Neutron L3HA. Because native Neutron + L3HA is stable, compatible with the Linux Bridge Agent, and is + a better means of enabling HA within a deployment this tool is no + longer being setup by default. If legacy L3HA is needed within a + deployment the deployer can set `neutron_legacy_ha_tool_enabled` to + **true** to enable the legacy tooling. diff --git a/tasks/main.yml b/tasks/main.yml index b8f507e2..029bc5d5 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -55,8 +55,9 @@ inventory_hostname == groups['neutron_all'][0] - include: neutron_l3_ha.yml - when: > - inventory_hostname in groups[neutron_services['neutron-l3-agent']['group']] + when: + - inventory_hostname in groups[neutron_services['neutron-l3-agent']['group']] + - neutron_legacy_ha_tool_enabled | bool - name: Flush handlers meta: flush_handlers diff --git a/tasks/neutron_l3_ha.yml b/tasks/neutron_l3_ha.yml index fb5b1a92..0206cac0 100644 --- a/tasks/neutron_l3_ha.yml +++ b/tasks/neutron_l3_ha.yml @@ -64,13 +64,3 @@ cron_file: "neutron-ha-tool" tags: - neutron-ha-tool - -- name: Remove old cronjobs if found. - file: - path: "{{ item }}" - state: "absent" - with_items: - - /etc/cron.d/replicate_dhcp - - /etc/cron.d/l3_agent_migrate - tags: - - neutron-ha-tool