diff --git a/lower-constraints.txt b/lower-constraints.txt
index b88ad9f33..fb3175cb7 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -102,6 +102,7 @@ pycparser==2.18
 pyflakes==0.8.1
 Pygments==2.2.0
 pyinotify==0.9.6
+PyMySQL==0.7.6
 pyOpenSSL==17.1.0
 pyparsing==2.1.0
 pyperclip==1.5.27
diff --git a/playbooks/migration-test/pre.yaml b/playbooks/migration-test/pre.yaml
new file mode 100644
index 000000000..7b08f90d6
--- /dev/null
+++ b/playbooks/migration-test/pre.yaml
@@ -0,0 +1,5 @@
+- hosts: all
+  roles:
+    - run-devstack
+    - role: bindep
+      bindep_profile: default
diff --git a/playbooks/migration-test/run.yaml b/playbooks/migration-test/run.yaml
new file mode 100644
index 000000000..a67b7ee24
--- /dev/null
+++ b/playbooks/migration-test/run.yaml
@@ -0,0 +1,338 @@
+
+- hosts: all
+  environment:
+    OS_CLOUD: devstack-admin
+  tasks:
+
+    - name: Collect Octavia user ID
+      command: openstack user show admin --format value -c id
+      register: octavia_account_id
+
+    - name: Get the neutron DB connection string
+      command: sed -ne "/^\[database\]/,/^\[.*\]/ { /^connection[ \t]*=/ s/^connection[ \t]*=[ \t]*//p; }" /etc/neutron/neutron.conf
+      register: neutron_db_connection
+
+    - name: Get the octavia DB connection string
+      command: sed -ne "/^\[database\]/,/^\[.*\]/ { /^connection[ \t]*=/ s/^connection[ \t]*=[ \t]*//p; }" /etc/octavia/octavia.conf
+      register: octavia_db_connection
+
+    - name: Generate nlbaas2octavia.conf
+      template:
+        src: templates/nlbaas2octavia.conf.j2
+        dest: nlbaas2octavia.conf
+
+# Create web server
+    - name: Create webserver network
+      command: openstack network create --disable-port-security -c id -f value webserver-net
+      register: webserver_net_id
+
+    - name: Create webserver subnet
+      command: openstack subnet create -c id -f value --allocation-pool start=172.17.1.10,end=172.17.1.200 --network webserver-net --subnet-range 172.17.1.0/24 webserver-subnet
+      register: webserver_subnet_id
+
+    - name: Create network port for webserver
+      command: openstack port create -c id --network {{ webserver_net_id.stdout }} --disable-port-security -f value webserver-port
+      register: webserver_port_id
+
+    - name: Add the network to the router
+      command: openstack router add subnet router1 webserver-subnet
+
+    - name: Get cirros image ID
+      shell: openstack image list --sort name:desc | grep -m 1 cirros | awk '{print $2}'
+      register: cirros_id
+
+    - name: Add a keypair
+      command: openstack keypair create --public-key /etc/octavia/.ssh/octavia_ssh_key.pub webserver_ssh_key
+
+    - name: Boot webserver
+      command: openstack server create --key-name webserver_ssh_key --image {{ cirros_id.stdout }} --flavor 1 --nic port-id={{ webserver_port_id.stdout }} webserver1
+
+    - name: Wait for webserver ACTIVE
+      command: openstack server show -c status -f value webserver1
+      register: result
+      until: result.stdout.find("ACTIVE") != -1
+      retries: 1800
+      delay: 1
+
+    - name: Get webserver IP
+      shell: openstack server show -c addresses -f value webserver1 | awk -F '=' '{print $2}'
+      register: webserver_ip
+
+    - name: Create floating IP for webserver
+      command: openstack floating ip create -c floating_ip_address -f value --port {{ webserver_port_id.stdout }} public
+      register: webserver_float_ip
+
+    - name: Copy webserver script to webserver instance
+      command: scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=5 -o ConnectionAttempts=360 -i /etc/octavia/.ssh/octavia_ssh_key {{ zuul.project.src_dir }}/devstack/samples/webserver.sh cirros@{{ webserver_float_ip.stdout }}:webserver.sh
+      become: true
+
+    - name: Set webserver script permisions
+      command: ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=5 -o ConnectionAttempts=360 -i /etc/octavia/.ssh/octavia_ssh_key cirros@{{ webserver_float_ip.stdout }} chmod 700 webserver.sh
+      become: true
+
+    - name: Launch webserver
+      command: ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o ConnectTimeout=5 -o ConnectionAttempts=360 -i /etc/octavia/.ssh/octavia_ssh_key cirros@{{ webserver_float_ip.stdout }} "screen -d -m sh webserver.sh"
+      become: true
+
+    - name: Test webserver
+      uri:
+        url: http://{{ webserver_float_ip.stdout }}
+      register: result
+      until: result.status == 200
+      retries: 300
+      delay: 1
+
+# Create neutron "octavia" load balancer
+
+    - name: Create neutron "octavia" load balancer
+      shell: neutron lbaas-loadbalancer-create --name lb1 -c id -f value --description lb1-desc --provider octavia private-subnet 2> /dev/null
+      register: lb1_id
+
+    - name: Wait for load balancer active
+      command: neutron lbaas-loadbalancer-show -c provisioning_status -f value lb1
+      register: result
+      until: result.stdout.find("ACTIVE") != -1
+      retries: 1800
+      delay: 1
+
+    - name: Get load balancer port ID
+      shell: neutron lbaas-loadbalancer-show -c vip_port_id -f value lb1 2> /dev/null
+      register: lb1_port_id
+
+    - name: Get load balancer VIP port security group ID
+      command: openstack port show -f value -c security_group_ids {{ lb1_port_id.stdout }}
+      register: lb_sg_id
+
+    - name: Create floating IP for load balancer VIP
+      command: openstack floating ip create -c floating_ip_address -f value --port {{ lb1_port_id.stdout }} public
+      register: lb1_float_ip
+
+    - name: Create neutron listener
+      command: neutron lbaas-listener-create --name listener1 --description listener1-desc --loadbalancer lb1 --protocol HTTP --protocol-port 80
+
+    - name: Wait for load balancer active
+      command: neutron lbaas-loadbalancer-show -c provisioning_status -f value lb1
+      register: result
+      until: result.stdout.find("ACTIVE") != -1
+      retries: 300
+      delay: 1
+
+    - name: Create neutron pool
+      command: neutron lbaas-pool-create --name pool1 --description pool1-desc --lb-algorithm SOURCE_IP --listener listener1 --protocol HTTP --session-persistence type=APP_COOKIE,cookie_name=sugar
+
+    - name: Wait for load balancer active
+      command: neutron lbaas-loadbalancer-show -c provisioning_status -f value lb1
+      register: result
+      until: result.stdout.find("ACTIVE") != -1
+      retries: 300
+      delay: 1
+
+    - name: Create neutron health monitor
+      command: neutron lbaas-healthmonitor-create --delay 5 --name hm1 --timeout 2 --http-method GET --url-path / --max-retries 2 --expected-codes 200 --type HTTP --pool pool1
+
+    - name: Wait for load balancer active
+      command: neutron lbaas-loadbalancer-show -c provisioning_status -f value lb1
+      register: result
+      until: result.stdout.find("ACTIVE") != -1
+      retries: 300
+      delay: 1
+
+    - name: Create neutron memeber
+      command: neutron lbaas-member-create --name member1 --address {{ webserver_ip.stdout }} --protocol-port 80 --subnet {{ webserver_subnet_id.stdout }} pool1
+
+    - name: Wait for load balancer active
+      command: neutron lbaas-loadbalancer-show -c provisioning_status -f value lb1
+      register: result
+      until: result.stdout.find("ACTIVE") != -1
+      retries: 300
+      delay: 1
+
+    - name: Test load balancer before migration
+      uri:
+        url: http://{{ lb1_float_ip.stdout }}
+      register: result
+      until: result.status == 200
+      retries: 300
+      delay: 1
+
+# Test the Octavia provider migration
+
+    - name: Run the migration
+      command: python {{ zuul.project.src_dir }}/tools/nlbaas2octavia/nlbaas2octavia.py --config-file nlbaas2octavia.conf --lb_id {{ lb1_id.stdout }}
+      register: nlbaas2octavia_output
+
+    - name: Dump the output
+      debug: msg={{ nlbaas2octavia_output.stdout }}
+
+    - name: Test load balancer after migration
+      uri:
+        url: http://{{ lb1_float_ip.stdout }}
+      register: result
+      until: result.status == 200
+      retries: 300
+      delay: 1
+
+    - name: Validate load balancer is no longer in neutron-lbaas
+      command: neutron lbaas-loadbalancer-show lb1
+      register: result
+      failed_when: result.rc != 1
+
+    - name: Validate Octavia load balancer is ACTIVE
+      command: openstack loadbalancer show -f value -c provisioning_status lb1
+      register: result
+      failed_when: result.stdout.find("ACTIVE") == -1
+
+    - name: Validate VIP port ownership
+      command: openstack port show -f value -c device_owner {{ lb1_port_id.stdout }}
+      register: result
+      failed_when: result.stdout.find("Octavia") == -1
+
+    - name: Validate VIP port security group ownership
+      command: openstack security group show -f value -c project_id {{ lb_sg_id.stdout }}
+      register: result
+      failed_when: result.stdout.find(octavia_account_id.stdout) == -1
+
+# Test the HAproxy provider migration
+# NOTE: At this time there is no HAProxy driver for Octavia. This tests
+#       just the data migration.
+
+    - name: Create neutron "haproxy" load balancer
+      shell: neutron lbaas-loadbalancer-create --name lb2 -c id -f value --description lb2-desc --provider haproxy private-subnet 2> /dev/null
+      register: lb2_id
+
+    - name: Wait for load balancer active
+      command: neutron lbaas-loadbalancer-show -c provisioning_status -f value lb2
+      register: result
+      until: result.stdout.find("ACTIVE") != -1
+      retries: 1800
+      delay: 1
+
+    - name: Get load balancer port ID
+      shell: neutron lbaas-loadbalancer-show -c vip_port_id -f value lb2 2> /dev/null
+      register: lb2_port_id
+
+    - name: Get load balancer VIP port security group ID
+      command: openstack port show -f value -c security_group_ids {{ lb2_port_id.stdout }}
+      register: lb_sg_id
+
+    - name: Create floating IP for load balancer VIP
+      command: openstack floating ip create -c id -f value --port {{ lb2_port_id.stdout }} public
+      register: lb2_float_ip_id
+
+    - name: Get floating IP address
+      command: openstack floating ip show -c floating_ip_address -f value {{ lb2_float_ip_id.stdout }}
+      register: lb2_float_ip
+
+    - name: Create neutron listener
+      command: neutron lbaas-listener-create --name listener2 --description listener2-desc --loadbalancer lb2 --protocol HTTP --protocol-port 80
+
+    - name: Wait for load balancer active
+      command: neutron lbaas-loadbalancer-show -c provisioning_status -f value lb2
+      register: result
+      until: result.stdout.find("ACTIVE") != -1
+      retries: 300
+      delay: 1
+
+    - name: Create neutron pool
+      command: neutron lbaas-pool-create --name pool2 --description pool2-desc --lb-algorithm SOURCE_IP --listener listener2 --protocol HTTP --session-persistence type=APP_COOKIE,cookie_name=sugar
+
+    - name: Wait for load balancer active
+      command: neutron lbaas-loadbalancer-show -c provisioning_status -f value lb2
+      register: result
+      until: result.stdout.find("ACTIVE") != -1
+      retries: 300
+      delay: 1
+
+    - name: Create neutron health monitor
+      command: neutron lbaas-healthmonitor-create --delay 5 --name hm2 --timeout 2 --http-method GET --url-path / --max-retries 2 --expected-codes 200 --type HTTP --pool pool2
+
+    - name: Wait for load balancer active
+      command: neutron lbaas-loadbalancer-show -c provisioning_status -f value lb2
+      register: result
+      until: result.stdout.find("ACTIVE") != -1
+      retries: 300
+      delay: 1
+
+    - name: Create neutron memeber
+      command: neutron lbaas-member-create --name member2 --address {{ webserver_ip.stdout }} --protocol-port 80 --subnet {{ webserver_subnet_id.stdout }} pool2
+
+    - name: Wait for load balancer active
+      command: neutron lbaas-loadbalancer-show -c provisioning_status -f value lb2
+      register: result
+      until: result.stdout.find("ACTIVE") != -1
+      retries: 300
+      delay: 1
+
+# Evidently the namespace driver doesn't open the VIP port in the SG
+    - name: Open port 80 on the lb2 VIP
+      command: openstack security group rule create --dst-port 80 --protocol tcp {{ lb_sg_id.stdout }}
+      register: result
+
+    - name: Test load balancer before migration
+      uri:
+        url: http://{{ lb2_float_ip.stdout }}
+      register: result
+      until: result.status == 200
+      retries: 300
+      delay: 1
+
+# Test the HAProxy provider migration
+
+    - name: Run the migration
+      command: python {{ zuul.project.src_dir }}/tools/nlbaas2octavia/nlbaas2octavia.py --config-file nlbaas2octavia.conf --lb_id {{ lb2_id.stdout }}
+      register: nlbaas2octavia_output
+
+    - name: Test load balancer after migration
+      uri:
+        url: http://{{ lb2_float_ip.stdout }}
+      register: result
+      until: result.status == 200
+      retries: 300
+      delay: 1
+
+    - name: Validate load balancer is no longer in neutron-lbaas
+      command: neutron lbaas-loadbalancer-show lb2
+      register: result
+      failed_when: result.rc != 1
+
+    - name: Validate Octavia load balancer is ACTIVE
+      command: openstack loadbalancer show -f value -c provisioning_status lb2
+      register: result
+      failed_when: result.stdout.find("ACTIVE") == -1
+
+    - name: Validate VIP port ownership
+      command: openstack port show -f value -c device_owner {{ lb2_port_id.stdout }}
+      register: result
+      failed_when: result.stdout.find("Octavia") == -1
+
+    - name: Validate VIP port security group ownership
+      command: openstack security group show -f value -c project_id {{ lb_sg_id.stdout }}
+      register: result
+      failed_when: result.stdout.find(octavia_account_id.stdout) == -1
+
+# Validate select load balancer settings migrated
+
+    - name: Validate load balancer name and port_id
+      command: openstack loadbalancer show -f value -c vip_port_id lb2
+      register: result
+      failed_when: result.stdout.find(lb2_port_id.stdout) == -1
+
+    - name: Validate listener name and protocol port
+      command: openstack loadbalancer listener show -f value -c protocol_port listener2
+      register: result
+      failed_when: result.stdout.find("80") == -1
+
+    - name: Validate pool name and session persistence
+      command: openstack loadbalancer pool show -f value -c session_persistence pool2
+      register: result
+      failed_when: result.stdout.find("sugar") == -1
+
+    - name: Validate health monitor name and delay
+      command: openstack loadbalancer healthmonitor show -f value -c delay hm2
+      register: result
+      failed_when: result.stdout.find("5") == -1
+
+    - name: Validate member name and address
+      command: openstack loadbalancer member show -f value -c address pool2 member2
+      register: result
+      failed_when: result.stdout.find(webserver_ip.stdout) == -1
diff --git a/playbooks/migration-test/templates/nlbaas2octavia.conf.j2 b/playbooks/migration-test/templates/nlbaas2octavia.conf.j2
new file mode 100644
index 000000000..b7ccaaf60
--- /dev/null
+++ b/playbooks/migration-test/templates/nlbaas2octavia.conf.j2
@@ -0,0 +1,14 @@
+[DEFAULT]
+
+debug = True
+
+[migration]
+
+# Octavia service account ID
+octavia_account_id = {{ octavia_account_id.stdout }}
+
+# Connection string for the neutron database
+neutron_db_connection = {{ neutron_db_connection.stdout }}
+
+# Connection string for the octavia database
+octavia_db_connection = {{ octavia_db_connection.stdout }}
diff --git a/releasenotes/notes/neutron-lbaas-to-octavia-migration-tool-c84cb76a84147863.yaml b/releasenotes/notes/neutron-lbaas-to-octavia-migration-tool-c84cb76a84147863.yaml
new file mode 100644
index 000000000..bab77a271
--- /dev/null
+++ b/releasenotes/notes/neutron-lbaas-to-octavia-migration-tool-c84cb76a84147863.yaml
@@ -0,0 +1,16 @@
+---
+prelude: >
+    Neutron-LBaaS was deprecated in the Queens series and is being replaced
+    by the Octavia project. Please see the FAQ for more information:
+    https://wiki.openstack.org/wiki/Neutron/LBaaS/Deprecation
+features:
+  - |
+    None. Neutron-LBaaS was deprecated in the Queens series.
+other:
+  - |
+    A Neutron-LBaaS to Octavia migration tool is available in the
+    tools/nlbaas2octavia directory. Please see the README.rst included
+    with the tool for operating details. This tool will live migrate
+    existing loadbalancers from Neutron-LBaaS to Octavia assuming the
+    provider supports live migration. The Octavia provider supports
+    live migration.
diff --git a/requirements.txt b/requirements.txt
index 3f0f9d78f..85a62328f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,6 +13,7 @@ alembic>=0.8.10 # MIT
 six>=1.10.0 # MIT
 oslo.config>=5.2.0 # Apache-2.0
 oslo.db>=4.27.0 # Apache-2.0
+oslo.i18n>=3.15.3 # Apache-2.0
 oslo.log>=3.36.0 # Apache-2.0
 oslo.messaging>=5.29.0 # Apache-2.0
 oslo.reports>=1.18.0 # Apache-2.0
@@ -22,6 +23,7 @@ oslo.utils>=3.33.0 # Apache-2.0
 python-barbicanclient>=4.5.2 # Apache-2.0
 pyasn1!=0.2.3,>=0.1.8 # BSD
 pyasn1-modules>=0.0.6 # BSD
+PyMySQL>=0.7.6 # MIT License
 pyOpenSSL>=17.1.0 # Apache-2.0
 stevedore>=1.20.0 # Apache-2.0
 cryptography>=2.1 # BSD/Apache-2.0
diff --git a/tools/nlbaas2octavia/README.rst b/tools/nlbaas2octavia/README.rst
new file mode 100644
index 000000000..19c6551fa
--- /dev/null
+++ b/tools/nlbaas2octavia/README.rst
@@ -0,0 +1,53 @@
+=======================================
+Neutron-LBaaS to Octavia Migration Tool
+=======================================
+
+
+This tool allows you to migrate existing, running load balancers from
+Neutron-LBaaS to Octavia. This is intended as a one-time migration tool used
+to move load balancers from being managed by Neutron-LBaaS to be managed by
+Octavia.
+
+.. warning::
+    We recommend you make a backup of both the neutron and octavia databases
+    before running this tool.
+
+.. warning::
+    You must have the provider driver loaded and enabled in Octavia for the
+    load  balancer(s) you are migrating.
+
+.. note::
+    This tool will not convert a load balancer from one provider to a
+    different provider. It will only migrate a load balancer using the
+    same provider in Neutron-LBaaS and Octavia.
+
+Background
+----------
+
+Neutron-LBaaS was deprecated during the Queens release of OpenStack.
+
+Theory of Operation
+-------------------
+
+Octavia is an improved superset of the Neutron-LBaaS API extension to Neutron.
+Because of this relationship the object model is very similar between the two.
+This tool will access the Neutron database (which contains the neutron-lbaas
+tables and records) and intelligently migrate the management records from the
+Neutron database to the Octavia database. The tool will also update neutron
+object ownership to reflect Octavia taking ownership for those objects.
+
+Objects that will change ownership are:
+Neutron ports
+Neutron security groups
+
+Usage
+-----
+
+.. line-block::
+
+    $ nlbaas2octavia --config-file <filename> [--all | --lb_id <id> | --project_id <project_id>]
+
+      '--all' Migrate all neutron-lbaas load balancers
+      '--config-file' The path to the configuration file
+      '--lb_id <id>' Migrate one load balancer by ID
+      '--project_id <project_id>' Migrate all load balancers owned by this project ID
diff --git a/tools/nlbaas2octavia/__init__.py b/tools/nlbaas2octavia/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tools/nlbaas2octavia/nlbaas2octavia.conf b/tools/nlbaas2octavia/nlbaas2octavia.conf
new file mode 100644
index 000000000..6f61281e7
--- /dev/null
+++ b/tools/nlbaas2octavia/nlbaas2octavia.conf
@@ -0,0 +1,25 @@
+[DEFAULT]
+
+# debug = False
+
+[migration]
+
+# Run without making changes
+# trial_run=False
+
+# Delete the load balancer records from neutron-lbaas after migration
+# delete_after_migration=True
+
+# Example db_connection:
+# connection = mysql+pymysql://root:pass@127.0.0.1:3306/octavia
+# Replace 127.0.0.1 above with the IP address of the database used by the
+# main octavia server. (Leave it as is if the database runs on this host.)
+
+# Octavia service account ID
+octavia_account_id =
+
+# Connection string for the neutron database
+neutron_db_connection =
+
+# Connection string for the octavia database
+octavia_db_connection =
diff --git a/tools/nlbaas2octavia/nlbaas2octavia.py b/tools/nlbaas2octavia/nlbaas2octavia.py
new file mode 100644
index 000000000..ffbd42ac1
--- /dev/null
+++ b/tools/nlbaas2octavia/nlbaas2octavia.py
@@ -0,0 +1,586 @@
+# Copyright 2018 Rackspace, US Inc.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import datetime
+import sys
+
+from oslo_config import cfg
+from oslo_db.sqlalchemy import enginefacade
+import oslo_i18n as i18n
+from oslo_log import log as logging
+
+_translators = i18n.TranslatorFactory(domain='nlbaas2octavia')
+
+# The primary translation function using the well-known name "_"
+_ = _translators.primary
+
+CONF = cfg.CONF
+
+cli_opts = [
+    cfg.BoolOpt('all', default=False,
+                help='Migrate all load balancers'),
+    cfg.StrOpt('lb_id',
+               help='Load balancer ID to migrate'),
+    cfg.StrOpt('project_id',
+               help='Migrate all load balancers owned by this project'),
+]
+
+migration_opts = [
+    cfg.BoolOpt('delete_after_migration', default=True,
+                help='Delete the load balancer records from neutron-lbaas'
+                     ' after migration'),
+    cfg.BoolOpt('trial_run', default=False,
+                help='Run without making changes.'),
+    cfg.StrOpt('octavia_account_id', required=True,
+               help='The keystone account ID Octavia is running under.'),
+    cfg.StrOpt('neutron_db_connection',
+               required=True,
+               help='The neutron database connection string'),
+    cfg.StrOpt('octavia_db_connection',
+               required=True,
+               help='The octavia database connection string'),
+]
+
+cfg.CONF.register_cli_opts(cli_opts)
+cfg.CONF.register_opts(migration_opts, group='migration')
+
+
+def cascade_delete_neutron_lb(n_session, lb_id):
+    listeners = n_session.execute(
+        "SELECT id FROM lbaas_listeners WHERE loadbalancer_id = :lb_id;",
+        {'lb_id': lb_id})
+    for listener in listeners:
+        l7policies = n_session.execute(
+            "SELECT id FROM lbaas_l7policies WHERE listener_id = :list_id;",
+            {'list_id': listener[0]})
+        for l7policy in l7policies:
+            # Delete l7rules
+            n_session.execute(
+                "DELETE FROM lbaas_l7rules WHERE l7policy_id = :l7p_id;",
+                {'l7p_id': l7policy[0]})
+        # Delete l7policies
+        n_session.execute(
+            "DELETE FROM lbaas_l7policies WHERE listener_id = :list_id;",
+            {'list_id': listener[0]})
+        # Delete SNI records
+        n_session.execute(
+            "DELETE FROM lbaas_sni WHERE listener_id = :list_id;",
+            {'list_id': listener[0]})
+
+    # Delete the listeners
+    n_session.execute(
+        "DELETE FROM lbaas_listeners WHERE loadbalancer_id = :lb_id;",
+        {'lb_id': lb_id})
+
+    pools = n_session.execute(
+        "SELECT id, healthmonitor_id FROM lbaas_pools "
+        "WHERE loadbalancer_id = :lb_id;", {'lb_id': lb_id}).fetchall()
+    for pool in pools:
+        # Delete the members
+        n_session.execute(
+            "DELETE FROM lbaas_members WHERE pool_id = :pool_id;",
+            {'pool_id': pool[0]})
+        # Delete the session persistence records
+        n_session.execute(
+            "DELETE FROM lbaas_sessionpersistences WHERE pool_id = :pool_id;",
+            {'pool_id': pool[0]})
+
+        # Delete the pools
+        n_session.execute(
+            "DELETE FROM lbaas_pools WHERE id = :pool_id;",
+            {'pool_id': pool[0]})
+
+        # Delete the health monitor
+        if pool[1]:
+            result = n_session.execute("DELETE FROM lbaas_healthmonitors "
+                                       "WHERE id = :id", {'id': pool[1]})
+            if result.rowcount != 1:
+                raise Exception(_('Failed to delete health monitor: '
+                                '%s') % pool[1])
+    # Delete the lb stats
+    n_session.execute(
+        "DELETE FROM lbaas_loadbalancer_statistics WHERE "
+        "loadbalancer_id = :lb_id;", {'lb_id': lb_id})
+
+    # Delete provider record
+    n_session.execute(
+        "DELETE FROM providerresourceassociations WHERE "
+        "resource_id = :lb_id;", {'lb_id': lb_id})
+
+    # Delete the load balanacer
+    n_session.execute(
+        "DELETE FROM lbaas_loadbalancers WHERE id = :lb_id;", {'lb_id': lb_id})
+
+
+def process_health_monitor(LOG, n_session, o_session, project_id,
+                           pool_id, hm_id):
+    hm = n_session.execute(
+        "SELECT type, delay, timeout, max_retries, http_method, url_path, "
+        "expected_codes, admin_state_up, provisioning_status, name, "
+        "max_retries_down FROM lbaas_healthmonitors WHERE id = :hm_id AND "
+        "provisioning_status = 'ACTIVE';", {'hm_id': hm_id}).fetchone()
+    LOG.debug('Migrating health manager: %s', hm_id)
+
+    if hm is None:
+        raise Exception(_('Health monitor %s has invalid '
+                        'provisioning_status.'), hm_id)
+
+    hm_op_status = 'ONLINE' if hm[7] else 'OFFLINE'
+
+    result = o_session.execute(
+        "INSERT INTO health_monitor (id, project_id, pool_id, type, delay, "
+        "timeout, fall_threshold, rise_threshold, http_method, url_path, "
+        "expected_codes, enabled, provisioning_status, name, created_at, "
+        "updated_at, operating_status) VALUES (:id, :project_id, :pool_id, "
+        ":type, :delay, :timeout, :fall_threshold, :rise_threshold, "
+        ":http_method, :url_path, :expected_codes, :enabled, "
+        ":provisioning_status, :name, :created_at, :updated_at, "
+        ":operating_status);",
+        {'id': hm_id, 'project_id': project_id, 'pool_id': pool_id,
+         'type': hm[0], 'delay': hm[1], 'timeout': hm[2],
+         'fall_threshold': hm[10], 'rise_threshold': hm[3],
+         'http_method': hm[4], 'url_path': hm[5], 'expected_codes': hm[6],
+         'enabled': hm[7], 'provisioning_status': hm[8], 'name': hm[9],
+         'operating_status': hm_op_status,
+         'created_at': datetime.datetime.utcnow(),
+         'updated_at': datetime.datetime.utcnow()})
+    if result.rowcount != 1:
+        raise Exception(_('Unable to create health monitor in the Octavia '
+                        'database.'))
+
+
+def process_session_persistence(n_session, o_session, pool_id):
+    # Setup session persistence if it is configured
+    sp = n_session.execute(
+        "SELECT type, cookie_name FROM lbaas_sessionpersistences "
+        "WHERE pool_id = :pool_id;", {'pool_id': pool_id}).fetchone()
+    if sp:
+        result = o_session.execute(
+            "INSERT INTO session_persistence (pool_id, type, cookie_name) "
+            "VALUES (:pool_id, :type, :cookie_name);",
+            {'pool_id': pool_id, 'type': sp[0], 'cookie_name': sp[1]})
+        if result.rowcount != 1:
+            raise Exception(_('Unable to create session persistence in the '
+                            'Octavia database.'))
+
+
+def process_members(LOG, n_session, o_session, project_id, pool_id):
+    # Handle members
+    members = n_session.execute(
+        "SELECT id, subnet_id, address, protocol_port, weight, "
+        "admin_state_up, provisioning_status, operating_status, name FROM "
+        "lbaas_members WHERE pool_id = :pool_id;",
+        {'pool_id': pool_id}).fetchall()
+    for member in members:
+        LOG.debug('Migrating member: %s', member[0])
+
+        if member[6] == 'DELETED':
+            continue
+        elif member[6] != 'ACTIVE':
+            raise Exception(_('Member is invalid state of %s.'), member[6])
+
+        result = o_session.execute(
+            "INSERT INTO member (id, pool_id, project_id, subnet_id, "
+            "ip_address, protocol_port, weight, operating_status, enabled, "
+            "created_at, updated_at, provisioning_status, name, backup) "
+            "VALUES (:id, :pool_id, :project_id, :subnet_id, :ip_address, "
+            ":protocol_port, :weight, :operating_status, :enabled, "
+            ":created_at, :updated_at, :provisioning_status, :name, :backup);",
+            {'id': member[0], 'pool_id': pool_id, 'project_id': project_id,
+             'subnet_id': member[1], 'ip_address': member[2],
+             'protocol_port': member[3], 'weight': member[4],
+             'operating_status': member[7], 'enabled': member[5],
+             'created_at': datetime.datetime.utcnow(),
+             'updated_at': datetime.datetime.utcnow(),
+             'provisioning_status': member[6], 'name': member[8],
+             'backup': False})
+    if result.rowcount != 1:
+        raise Exception(_('Unable to create member in the Octavia database.'))
+
+
+def process_SNI(n_session, o_session, listener_id):
+    SNIs = n_session.execute(
+        "SELECT tls_container_id, position FROM lbaas_sni WHERE "
+        "listener_id = :listener_id;", {'listener_id': listener_id}).fetchall()
+    for SNI in SNIs:
+        result = o_session.execute(
+            "INSERT INTO sni (listener_id, tls_container_id, position) VALUES "
+            "(:listener_id, :tls_container_id, :position);",
+            {'listener_id': listener_id, 'tls_container_id': SNI[0],
+             'position': SNI[1]})
+        if result.rowcount != 1:
+            raise Exception(_('Unable to create SNI record in the Octavia '
+                            'database.'))
+
+
+def process_L7policies(LOG, n_session, o_session, listener_id, project_id):
+    l7policies = n_session.execute(
+        "SELECT id, name, description, listener_id, action, "
+        "redirect_pool_id, redirect_url, position, "
+        "provisioning_status, admin_state_up FROM "
+        "lbaas_l7policies WHERE listener_id = :listener_id AND "
+        "provisioning_status = 'ACTIVE';",
+        {'listener_id': listener_id}).fetchall()
+    for l7policy in l7policies:
+        LOG.debug('Migrating L7 policy: %s', l7policy[0])
+
+        if l7policy[8] == 'DELETED':
+            continue
+        elif l7policy[8] != 'ACTIVE':
+            raise Exception(_('L7 policy is invalid state of %s.'),
+                            l7policy[8])
+
+        L7p_op_status = 'ONLINE' if l7policy[9] else 'OFFLINE'
+
+        result = o_session.execute(
+            "INSERT INTO l7policy (id, name, description, listener_id, "
+            "action, redirect_pool_id, redirect_url, position, enabled, "
+            "provisioning_status, created_at, updated_at, project_id, "
+            "operating_status) VALUES (:id, :name, :description, "
+            ":listener_id, :action, :redirect_pool_id, :redirect_url, "
+            ":position, :enabled, :provisioning_status, :created_at, "
+            ":updated_at, :project_id, :operating_status);",
+            {'id': l7policy[0], 'name': l7policy[1],
+             'description': l7policy[2], 'listener_id': listener_id,
+             'action': l7policy[4], 'redirect_pool_id': l7policy[5],
+             'redirect_url': l7policy[6], 'position': l7policy[7],
+             'enabled': l7policy[9], 'provisioning_status': l7policy[8],
+             'created_at': datetime.datetime.utcnow(),
+             'updated_at': datetime.datetime.utcnow(),
+             'project_id': project_id, 'operating_status': L7p_op_status})
+        if result.rowcount != 1:
+            raise Exception(_('Unable to create L7 policy in the Octavia '
+                            'database.'))
+        # Handle L7 rules
+        l7rules = n_session.execute(
+            "SELECT id, type, compare_type, invert, key, value, "
+            "provisioning_status, admin_state_up FROM lbaas_l7rules WHERE "
+            "l7policy_id = :l7policy_id AND provisioning_status = 'ACTIVE';",
+            {'l7policy_id': l7policy[0]}).fetchall()
+        for l7rule in l7rules:
+            LOG.debug('Migrating L7 rule: %s', l7policy[0])
+
+            if l7rule[6] == 'DELETED':
+                continue
+            elif l7rule[6] != 'ACTIVE':
+                raise Exception(_('L7 rule is invalid state of %s.'),
+                                l7rule[6])
+
+            L7r_op_status = 'ONLINE' if l7rule[7] else 'OFFLINE'
+
+            result = o_session.execute(
+                "INSERT INTO l7rule (id, l7policy_id, type, compare_type, "
+                "key, value, invert, provisioning_status, created_at, "
+                "updated_at, project_id, enabled, operating_status) VALUES "
+                "(:id, :l7policy_id, :type, :compare_type, :key, :value, "
+                ":invert, :provisioning_status, :created_at, :updated_at, "
+                ":project_id, :enabled, :operating_status);",
+                {'id': l7rule[0], 'l7policy_id': l7policy[0],
+                 'type': l7rule[1], 'compare_type': l7rule[2],
+                 'key': l7rule[4], 'value': l7rule[5], 'invert': l7rule[3],
+                 'provisioning_status': l7rule[6],
+                 'created_at': datetime.datetime.utcnow(),
+                 'updated_at': datetime.datetime.utcnow(),
+                 'project_id': project_id, 'enabled': l7rule[7],
+                 'operating_status': L7r_op_status})
+            if result.rowcount != 1:
+                raise Exception(_('Unable to create L7 policy in the Octavia '
+                                'database.'))
+
+
+def migrate_lb(LOG, n_session_maker, o_session_maker, lb_id):
+
+    n_session = n_session_maker(autocommit=False)
+    o_session = o_session_maker(autocommit=False)
+
+    LOG.info('Migrating load balancer: %s', lb_id)
+    try:
+        # Lock the load balancer in neutron DB
+        result = n_session.execute(
+            "UPDATE lbaas_loadbalancers SET "
+            "provisioning_status = 'PENDING_UPDATE' WHERE id = :id AND "
+            "provisioning_status = 'ACTIVE';", {'id': lb_id})
+        if result.rowcount != 1:
+            raise Exception(_('Load balancer is not provisioning_status '
+                            'ACTIVE'))
+
+        # Get the load balancer record from neutron
+        n_lb = n_session.execute(
+            "SELECT b.provider_name, a.project_id, a.name, a.description, "
+            "a.admin_state_up, a.operating_status, a.flavor_id, "
+            "a.vip_port_id, a.vip_subnet_id, a.vip_address "
+            "FROM lbaas_loadbalancers a JOIN providerresourceassociations b "
+            "ON a.id = b.resource_id WHERE ID = :id;",
+            {'id': lb_id}).fetchone()
+
+        # Migrate the port and security groups to Octavia
+        vip_port = n_session.execute(
+            "SELECT a.device_owner, a.project_id, b.security_group_id "
+            "FROM ports a JOIN securitygroupportbindings b ON "
+            "a.id = b.port_id  where id = :id;",
+            {'id': n_lb[7]}).fetchone()
+
+        # neutron-lbaas does not support user VIP ports, so take
+        # ownership of the port and security group
+        if vip_port[0] == 'neutron:LOADBALANCERV2':
+            result = n_session.execute(
+                "UPDATE ports SET device_owner = 'Octavia', "
+                "project_id = :proj_id WHERE "
+                "id = :id;", {'id': n_lb[7],
+                              'proj_id': CONF.migration.octavia_account_id})
+            if result.rowcount != 1:
+                raise Exception(_('Unable to update VIP port in the neutron '
+                                'database.'))
+            result = n_session.execute(
+                "UPDATE securitygroups SET project_id = :proj_id WHERE "
+                "id = :id;", {'proj_id': CONF.migration.octavia_account_id,
+                              'id': vip_port[2]})
+            if result.rowcount != 1:
+                raise Exception(_('Unable to update VIP security group in the '
+                                'neutron database.'))
+
+        # Octavia driver load balancers are now done, next process the other
+        # provider driver load balancers
+        if n_lb[0] != 'octavia':
+            # Create the load balancer
+            result = o_session.execute(
+                "INSERT INTO load_balancer (id, project_id, name, "
+                "description, provisioning_status, operating_status, enabled, "
+                "created_at, updated_at, provider) VALUES (:id, :project_id, "
+                ":name, :description, :provisioning_status, "
+                ":operating_status, :enabled, :created_at, :updated_at, "
+                ":provider);",
+                {'id': lb_id, 'project_id': n_lb[1], 'name': n_lb[2],
+                 'description': n_lb[3], 'provisioning_status': 'ACTIVE',
+                 'operating_status': n_lb[5], 'enabled': n_lb[4],
+                 'created_at': datetime.datetime.utcnow(),
+                 'updated_at': datetime.datetime.utcnow(),
+                 'provider': n_lb[0]})
+            if result.rowcount != 1:
+                raise Exception(_('Unable to create load balancer in the '
+                                'Octavia database.'))
+
+            # Get the network ID for the VIP
+            subnet = n_session.execute(
+                "SELECT network_id FROM subnets WHERE id = :id;",
+                {'id': n_lb[8]}).fetchone()
+
+            # Create VIP record
+            result = o_session.execute(
+                "INSERT INTO vip (load_balancer_id, ip_address, port_id, "
+                "subnet_id, network_id) VALUES (:lb_id, :ip_address, "
+                ":port_id, :subnet_id, :network_id);",
+                {'lb_id': lb_id, 'ip_address': n_lb[9], 'port_id': n_lb[7],
+                 'subnet_id': n_lb[8], 'network_id': subnet[0]})
+            if result.rowcount != 1:
+                raise Exception(_('Unable to create VIP in the Octavia '
+                                'database.'))
+
+            # Create pools
+            pools = n_session.execute(
+                "SELECT id, name, description, protocol, lb_algorithm, "
+                "healthmonitor_id, admin_state_up, provisioning_status, "
+                "operating_status FROM lbaas_pools WHERE loadbalancer_id "
+                " = :lb_id;",
+                {'lb_id': lb_id}).fetchall()
+            for pool in pools:
+                LOG.debug('Migrating pool: %s', pool[0])
+
+                if pool[7] == 'DELETED':
+                    continue
+                elif pool[7] != 'ACTIVE':
+                    raise Exception(_('Pool is invalid state of %s.'), pool[7])
+
+                result = o_session.execute(
+                    "INSERT INTO pool (id, project_id, name, description, "
+                    "protocol, lb_algorithm, operating_status, enabled, "
+                    "load_balancer_id, created_at, updated_at, "
+                    "provisioning_status) VALUES (:id, :project_id, :name, "
+                    ":description, :protocol, :lb_algorithm, "
+                    ":operating_status, :enabled, :load_balancer_id,"
+                    ":created_at, :updated_at, :provisioning_status);",
+                    {'id': pool[0], 'project_id': n_lb[1], 'name': pool[1],
+                     'description': pool[2], 'protocol': pool[3],
+                     'lb_algorithm': pool[4], 'operating_status': pool[8],
+                     'enabled': pool[6], 'load_balancer_id': lb_id,
+                     'created_at': datetime.datetime.utcnow(),
+                     'updated_at': datetime.datetime.utcnow(),
+                     'provisioning_status': pool[7]})
+                if result.rowcount != 1:
+                    raise Exception(_('Unable to create pool in the '
+                                    'Octavia database.'))
+
+                # Create health monitor if there is one
+                if pool[5] is not None:
+                    process_health_monitor(LOG, n_session, o_session,
+                                           n_lb[1], pool[0], pool[5])
+
+                # Handle the session persistence records
+                process_session_persistence(n_session, o_session, pool[0])
+
+                # Handle the pool memebers
+                process_members(LOG, n_session, o_session, n_lb[1], pool[0])
+
+            lb_stats = n_session.execute(
+                "SELECT bytes_in, bytes_out, active_connections, "
+                "total_connections FROM lbaas_loadbalancer_statistics WHERE "
+                "loadbalancer_id = :lb_id;", {'lb_id': lb_id}).fetchone()
+            listeners = n_session.execute(
+                "SELECT id, name, description, protocol, protocol_port, "
+                "connection_limit, default_pool_id, admin_state_up, "
+                "provisioning_status, operating_status, "
+                "default_tls_container_id FROM lbaas_listeners WHERE "
+                "loadbalancer_id = :lb_id;", {'lb_id': lb_id}).fetchall()
+            for listener in listeners:
+                LOG.debug('Migrating listener: %s', listener[0])
+
+                if listener[8] == 'DELETED':
+                    continue
+                elif listener[8] != 'ACTIVE':
+                    raise Exception(_('Listener is invalid state of %s.'),
+                                    listener[8])
+
+                result = o_session.execute(
+                    "INSERT INTO listener (id, project_id, name, description, "
+                    "protocol, protocol_port, connection_limit, "
+                    "load_balancer_id, tls_certificate_id, default_pool_id, "
+                    "provisioning_status, operating_status, enabled, "
+                    "created_at, updated_at) VALUES (:id, :project_id, :name, "
+                    ":description, :protocol, :protocol_port, "
+                    ":connection_limit, :load_balancer_id, "
+                    ":tls_certificate_id, :default_pool_id, "
+                    ":provisioning_status, :operating_status, :enabled, "
+                    ":created_at, :updated_at);",
+                    {'id': listener[0], 'project_id': n_lb[1],
+                     'name': listener[1], 'description': listener[2],
+                     'protocol': listener[3], 'protocol_port': listener[4],
+                     'connection_limit': listener[5],
+                     'load_balancer_id': lb_id,
+                     'tls_certificate_id': listener[10],
+                     'default_pool_id': listener[6],
+                     'provisioning_status': listener[8],
+                     'operating_status': listener[9], 'enabled': listener[7],
+                     'created_at': datetime.datetime.utcnow(),
+                     'updated_at': datetime.datetime.utcnow()})
+                if result.rowcount != 1:
+                    raise Exception(_('Unable to create listener in the '
+                                    'Octavia database.'))
+
+                # Convert load balancer stats to listener stats
+                # This conversion may error on the low side due to
+                # the division
+                result = o_session.execute(
+                    "INSERT INTO listener_statistics (listener_id, bytes_in, "
+                    "bytes_out, active_connections, total_connections, "
+                    "amphora_id, request_errors) VALUES (:listener_id, "
+                    ":bytes_in, :bytes_out, :active_connections, "
+                    ":total_connections, :amphora_id, :request_errors);",
+                    {'listener_id': listener[0],
+                     'bytes_in': int(lb_stats[0] / len(listeners)),
+                     'bytes_out': int(lb_stats[1] / len(listeners)),
+                     'active_connections': int(lb_stats[2] / len(listeners)),
+                     'total_connections': int(lb_stats[3] / len(listeners)),
+                     'amphora_id': listener[0], 'request_errors': 0})
+                if result.rowcount != 1:
+                    raise Exception(_('Unable to create listener statistics '
+                                    'in the Octavia database.'))
+
+                # Handle SNI certs
+                process_SNI(n_session, o_session, listener[0])
+
+                # Handle L7 policy records
+                process_L7policies(LOG, n_session, o_session,
+                                   listener[0], n_lb[1])
+
+        # Delete the old neutron-lbaas records
+        if (CONF.migration.delete_after_migration and not
+                CONF.migration.trial_run):
+            cascade_delete_neutron_lb(n_session, lb_id)
+
+        if CONF.migration.trial_run:
+            o_session.rollback()
+            n_session.rollback()
+            LOG.info('Simulated migration of load balancer %s successful.',
+                     lb_id)
+        else:
+            o_session.commit()
+            n_session.commit()
+            LOG.info('Migration of load balancer %s successful.', lb_id)
+        return 0
+    except Exception as e:
+        n_session.rollback()
+        o_session.rollback()
+        LOG.exception("Skipping load balancer %s due to: %s.", lb_id, str(e))
+        return 1
+
+
+def main():
+    if len(sys.argv) == 1:
+        print('Error: Config file must be specified.')
+        print('nlbaas2octavia --config-file <filename>')
+        return 1
+    logging.register_options(cfg.CONF)
+    cfg.CONF(args=sys.argv[1:],
+             project='nlbaas2octavia',
+             version='nlbaas2octavia 1.0')
+    logging.set_defaults()
+    logging.setup(cfg.CONF, 'nlbaas2octavia')
+    LOG = logging.getLogger('nlbaas2octavia')
+    CONF.log_opt_values(LOG, logging.DEBUG)
+
+    if not CONF.all and not CONF.lb_id and not CONF.project_id:
+        print('Error: One of --all, --lb_id, --project_id must be specified.')
+        return 1
+
+    if ((CONF.all and (CONF.lb_id or CONF.project_id)) or
+            (CONF.lb_id and CONF.project_id)):
+        print('Error: Only one of --all, --lb_id, --project_id allowed.')
+        return 1
+
+    neutron_context_manager = enginefacade.transaction_context()
+    neutron_context_manager.configure(
+        connection=CONF.migration.neutron_db_connection)
+    n_session_maker = neutron_context_manager.writer.get_sessionmaker()
+
+    octavia_context_manager = enginefacade.transaction_context()
+    octavia_context_manager.configure(
+        connection=CONF.migration.octavia_db_connection)
+    o_session_maker = octavia_context_manager.writer.get_sessionmaker()
+
+    LOG.info('Starting migration.')
+
+    n_session = n_session_maker(autocommit=True)
+    lb_id_list = []
+
+    if CONF.lb_id:
+        lb_id_list = [[CONF.lb_id]]
+    elif CONF.project_id:
+        lb_id_list = n_session.execute(
+            "SELECT id FROM neutron.lbaas_loadbalancers WHERE "
+            "project_id = :id AND provisioning_status = 'ACTIVE';",
+            {'id': CONF.project_id}).fetchall()
+    else:  # CONF.ALL
+        lb_id_list = n_session.execute(
+            "SELECT id FROM neutron.lbaas_loadbalancers WHERE "
+            "provisioning_status = 'ACTIVE';").fetchall()
+
+    failure_count = 0
+    for lb in lb_id_list:
+        failure_count += migrate_lb(LOG, n_session_maker,
+                                    o_session_maker, lb[0])
+    if failure_count:
+        sys.exit(1)
+
+if __name__ == "__main__":
+    main()
diff --git a/tools/nlbaas2octavia/requirements.txt b/tools/nlbaas2octavia/requirements.txt
new file mode 100644
index 000000000..dd9e1b0e9
--- /dev/null
+++ b/tools/nlbaas2octavia/requirements.txt
@@ -0,0 +1,8 @@
+# The order of packages is significant, because pip processes them in the order
+# of appearance. Changing the order has an impact on the overall integration
+# process, which may cause wedges in the gate later.
+oslo.config>=4.6.0 # Apache-2.0
+oslo.db>=4.27.0 # Apache-2.0
+oslo.i18n>=3.15.3 # Apache-2.0
+oslo.log>=3.30.0 # Apache-2.0
+PyMySQL>=0.7.6 # MIT License
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 59e5bc28e..3f181d8cc 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -70,3 +70,94 @@
     parent: nlbaas-legacy-dsvm-base
     run: playbooks/legacy/neutron-lbaasv2-dsvm-api-l7octavia/run.yaml
     post-run: playbooks/legacy/neutron-lbaasv2-dsvm-api-l7octavia/post.yaml
+
+- job:
+    name: neutron-lbaas-to-octavia-migration
+    parent: devstack-minimal
+    timeout: 7800
+    nodeset: openstack-single-node
+    pre-run: playbooks/migration-test/pre.yaml
+    run: playbooks/migration-test/run.yaml
+    required-projects:
+      - openstack/diskimage-builder
+      - openstack/glance
+      - openstack/keystone
+      - openstack/neutron
+      - openstack/neutron-lbaas
+      - openstack/nova
+      - openstack/octavia
+      - openstack/python-neutronclient
+      - openstack/python-octaviaclient
+    vars:
+      devstack_localrc:
+        NEUTRON_LBAAS_SERVICE_PROVIDERV2: "\"LOADBALANCERV2:Octavia:neutron_lbaas.drivers.octavia.driver.OctaviaDriver:default LOADBALANCERV2:Haproxy:neutron_lbaas.drivers.haproxy.plugin_driver.HaproxyOnHostPluginDriver:\""
+      devstack_local_conf:
+        post-config:
+          $NEUTRON_CONF:
+            DEFAULT:
+              global_physnet_mtu: "{{ external_bridge_mtu }}"
+      devstack_services:
+        # Core services enabled for this branch.
+        # This list replaces the test-matrix.
+        # Shared services
+        dstat: true
+        etcd3: true
+        mysql: true
+        peakmem_tracker: true
+        rabbit: true
+        tls-proxy: true
+        # Keystone services
+        key: true
+        # Glance services
+        g-api: true
+        g-reg: true
+        # Nova services
+        n-api: true
+        n-api-meta: true
+        n-cauth: true
+        n-cond: true
+        n-cpu: true
+        n-novnc: true
+        n-obj: true
+        n-sch: true
+        placement-api: true
+        # Neutron services
+        # We need to keep using the neutron-legacy based services for
+        # now until all issues with the new lib/neutron code are solved
+        q-agt: true
+        q-dhcp: true
+        q-l3: true
+        q-meta: true
+        q-metering: true
+        q-svc: true
+        q-lbaasv2: true
+        # neutron-api: true
+        # neutron-agent: true
+        # neutron-dhcp: true
+        # neutron-l3: true
+        # neutron-metadata-agent: true
+        # neutron-metering: true
+        # Octavia services
+        octavia: true
+        o-api: true
+        o-cw: true
+        o-hk: true
+        o-hm: true
+        # Services we don't need.
+        # Swift services
+        s-account: false
+        s-container: false
+        s-object: false
+        s-proxy: false
+        # Cinder services
+        c-api: false
+        c-bak: false
+        c-sch: false
+        c-vol: false
+        cinder: false
+        # This section is not really needed, it's for readability.
+        horizon: false
+        tempest: false
+      devstack_plugins:
+        octavia: https://github.com/openstack/octavia.git
+        neutron-lbaas: https://github.com/openstack/neutron-lbaas.git
diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml
index 7160d04d7..45ad562ad 100644
--- a/zuul.d/projects.yaml
+++ b/zuul.d/projects.yaml
@@ -16,7 +16,6 @@
             branches: ^(?!stable/ocata).*$
         - neutron-lbaasv2-dsvm-api-l7octavia:
             voting: false
-
     gate:
       queue: neutron-lbaas
       jobs:
@@ -33,3 +32,6 @@
         - neutron-lbaasv2-dsvm-scenario-namespace
         - neutron-lbaasv2-dsvm-py3x-scenario-namespace:
             branches: ^(?!stable/ocata).*$
+    periodic:
+      jobs:
+        - neutron-lbaas-to-octavia-migration