13 files changed, 0 insertions, 1180 deletions
diff --git a/ansible/roles/neutron/tasks/bootstrap.yml b/ansible/roles/neutron/tasks/bootstrap.yml
deleted file mode 100644
index 526743fb9..000000000
--- a/ansible/roles/neutron/tasks/bootstrap.yml
+++ /dev/null
@@ -1,41 +0,0 @@
----
-- name: Creating Neutron database
-  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-    -m mysql_db
-    -a "login_host='{{ database_address }}'
-        login_port='{{ database_port }}'
-        login_user='{{ database_user }}'
-        login_password='{{ database_password }}'
-        name='{{ neutron_database_name }}'"
-  register: database
-  changed_when: "{{ database.stdout.find('localhost | SUCCESS => ') != -1 and
-                    (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
-  failed_when: database.stdout.split()[2] != 'SUCCESS'
-  run_once: True
-  delegate_to: "{{ groups['neutron-server'][0] }}"
-
-- name: Reading json from variable
-  set_fact:
-    database_created: "{{ (database.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
-
-- name: Creating Neutron database user and setting permissions
-  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-    -m mysql_user
-    -a "login_host='{{ database_address }}'
-        login_port='{{ database_port }}'
-        login_user='{{ database_user }}'
-        login_password='{{ database_password }}'
-        name='{{ neutron_database_name }}'
-        password='{{ neutron_database_password }}'
-        host='%'
-        priv='{{ neutron_database_name }}.*:ALL'
-        append_privs='yes'"
-  register: database_user_create
-  changed_when: "{{ database_user_create.stdout.find('localhost | SUCCESS => ') != -1 and
-                    (database_user_create.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
-  failed_when: database_user_create.stdout.split()[2] != 'SUCCESS'
-  run_once: True
-  delegate_to: "{{ groups['neutron-server'][0] }}"
-
-- include: bootstrap_service.yml
-  when: database_created
diff --git a/ansible/roles/neutron/tasks/bootstrap_service.yml b/ansible/roles/neutron/tasks/bootstrap_service.yml
deleted file mode 100644
index 50d114535..000000000
--- a/ansible/roles/neutron/tasks/bootstrap_service.yml
+++ /dev/null
@@ -1,66 +0,0 @@
----
-- name: Running Neutron bootstrap container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    detach: False
-    environment:
-      KOLLA_BOOTSTRAP:
-      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
-    image: "{{ neutron_server_image_full }}"
-    labels:
-      BOOTSTRAP:
-    name: "bootstrap_neutron"
-    restart_policy: "never"
-    volumes:
-      - "{{ node_config_directory }}/neutron-server/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "kolla_logs:/var/log/kolla/"
-  run_once: True
-  delegate_to: "{{ groups['neutron-server'][0] }}"
-
-- name: Running Neutron lbaas bootstrap container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    detach: False
-    environment:
-      KOLLA_BOOTSTRAP:
-      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
-    image: "{{ neutron_lbaas_agent_image_full }}"
-    labels:
-      BOOTSTRAP:
-    name: "bootstrap_neutron_lbaas_agent"
-    restart_policy: "never"
-    volumes:
-      - "{{ node_config_directory }}/neutron-lbaas-agent/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "kolla_logs:/var/log/kolla/"
-  when:
-    - enable_neutron_lbaas | bool
-    - inventory_hostname in groups['neutron-lbaas-agent']
-  run_once: True
-  delegate_to: "{{ groups['neutron-lbaas-agent'][0] }}"
-
-- name: Running Neutron vpnaas bootstrap container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    detach: False
-    environment:
-      KOLLA_BOOTSTRAP:
-      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
-    image: "{{ neutron_vpnaas_agent_image_full }}"
-    labels:
-      BOOTSTRAP:
-    name: "bootstrap_neutron_vpnaas_agent"
-    restart_policy: "never"
-    volumes:
-      - "{{ node_config_directory }}/neutron-vpnaas-agent/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "kolla_logs:/var/log/kolla/"
-  when:
-    - enable_neutron_vpnaas | bool
-    - inventory_hostname in groups['neutron-vpnaas-agent']
-  run_once: True
-  delegate_to: "{{ groups['neutron-vpnaas-agent'][0] }}"
diff --git a/ansible/roles/neutron/tasks/config-neutron-fake.yml b/ansible/roles/neutron/tasks/config-neutron-fake.yml
deleted file mode 100644
index 7051911f0..000000000
--- a/ansible/roles/neutron/tasks/config-neutron-fake.yml
+++ /dev/null
@@ -1,49 +0,0 @@
----
-- name: Ensuring config directories exist
-  file:
-    path: "{{ node_config_directory }}/neutron-openvswitch-agent-fake-{{ item }}"
-    state: "directory"
-    recurse: yes
-  with_sequence: start=1 end={{ num_nova_fake_per_node }}
-  when: inventory_hostname in groups['compute']
-
-- name: Copying over config.json files for services
-  template:
-    src: "neutron-openvswitch-agent.json.j2"
-    dest: "{{ node_config_directory }}/neutron-openvswitch-agent-fake-{{ item }}/config.json"
-  with_sequence: start=1 end={{ num_nova_fake_per_node }}
-  when:
-    - inventory_hostname in groups['compute']
-    - neutron_plugin_agent == "openvswitch"
-
-- name: Copying over neutron.conf
-  merge_configs:
-    vars:
-      service_name: "{{ item }}"
-    sources:
-      - "{{ role_path }}/templates/neutron.conf.j2"
-      - "{{ node_config_directory }}/config/global.conf"
-      - "{{ node_config_directory }}/config/database.conf"
-      - "{{ node_config_directory }}/config/messaging.conf"
-      - "{{ node_config_directory }}/config/neutron.conf"
-      - "{{ node_config_directory }}/config/neutron/{{ item }}.conf"
-      - "{{ node_config_directory }}/config/neutron/{{ inventory_hostname }}/neutron.conf"
-    dest: "{{ node_config_directory }}/neutron-openvswitch-agent-fake-{{ item }}/neutron.conf"
-  with_sequence: start=1 end={{ num_nova_fake_per_node }}
-  when:
-    - inventory_hostname in groups['compute']
-    - neutron_plugin_agent == "openvswitch"
-
-- name: Copying over ml2_conf.ini
-  merge_configs:
-    vars:
-      service_name: "{{ item }}"
-    sources:
-      - "{{ role_path }}/templates/ml2_conf.ini.j2"
-      - "{{ node_config_directory }}/config/neutron/ml2_conf.ini"
-      - "{{ node_config_directory }}/config/neutron/{{ inventory_hostname }}/neutron.conf"
-    dest: "{{ node_config_directory }}/neutron-openvswitch-agent-fake-{{ item }}/ml2_conf.ini"
-  with_sequence: start=1 end={{ num_nova_fake_per_node }}
-  when:
-    - inventory_hostname in groups['compute']
-    - neutron_plugin_agent == "openvswitch"
diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml
deleted file mode 100644
index bc18d0380..000000000
--- a/ansible/roles/neutron/tasks/config.yml
+++ /dev/null
@@ -1,205 +0,0 @@
----
-- name: Setting sysctl values
-  sysctl: name={{ item.name }} value={{ item.value }} sysctl_set=yes
-  with_items:
-    - { name: "net.ipv4.ip_forward", value: 1}
-    - { name: "net.ipv4.conf.all.rp_filter", value: 0}
-    - { name: "net.ipv4.conf.default.rp_filter", value: 0}
-  when:
-    - set_sysctl | bool
-    - inventory_hostname in groups['neutron-l3-agent']
-      or inventory_hostname in groups['neutron-vpnaas-agent']
-
-- name: Ensuring config directories exist
-  file:
-    path: "{{ node_config_directory }}/{{ item }}"
-    state: "directory"
-    recurse: yes
-  with_items:
-    - "neutron-dhcp-agent"
-    - "neutron-l3-agent"
-    - "neutron-linuxbridge-agent"
-    - "neutron-metadata-agent"
-    - "neutron-openvswitch-agent"
-    - "neutron-server"
-    - "openvswitch-db-server"
-    - "openvswitch-vswitchd"
-    - "neutron-lbaas-agent"
-    - "neutron-vpnaas-agent"
-
-- name: Copying over config.json files for services
-  template:
-    src: "{{ item }}.json.j2"
-    dest: "{{ node_config_directory }}/{{ item }}/config.json"
-  with_items:
-    - "neutron-dhcp-agent"
-    - "neutron-l3-agent"
-    - "neutron-linuxbridge-agent"
-    - "neutron-metadata-agent"
-    - "neutron-openvswitch-agent"
-    - "neutron-server"
-    - "openvswitch-db-server"
-    - "openvswitch-vswitchd"
-    - "neutron-lbaas-agent"
-    - "neutron-vpnaas-agent"
-
-- name: Copying over neutron.conf
-  merge_configs:
-    vars:
-      service_name: "{{ item }}"
-    sources:
-      - "{{ role_path }}/templates/neutron.conf.j2"
-      - "{{ node_custom_config }}/global.conf"
-      - "{{ node_custom_config }}/database.conf"
-      - "{{ node_custom_config }}/messaging.conf"
-      - "{{ node_custom_config }}/neutron.conf"
-      - "{{ node_custom_config }}/neutron/{{ item }}.conf"
-      - "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/neutron.conf"
-    dest: "{{ node_config_directory }}/{{ item }}/neutron.conf"
-  with_items:
-    - "neutron-dhcp-agent"
-    - "neutron-l3-agent"
-    - "neutron-linuxbridge-agent"
-    - "neutron-metadata-agent"
-    - "neutron-openvswitch-agent"
-    - "neutron-server"
-    - "neutron-lbaas-agent"
-    - "neutron-vpnaas-agent"
-
-- name: Copying over neutron_lbaas.conf
-  merge_configs:
-    vars:
-      service_name: "{{ item }}"
-    sources:
-      - "{{ role_path }}/templates/neutron_lbaas.conf.j2"
-      - "{{ node_custom_config }}/neutron/neutron_lbaas.conf"
-      - "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/neutron_lbaas.conf"
-    dest: "{{ node_config_directory }}/{{ item }}/neutron_lbaas.conf"
-  with_items:
-    - "neutron-server"
-
-- name: Copying over neutron_vpnaas.conf
-  merge_configs:
-    vars:
-      service_name: "{{ item }}"
-    sources:
-      - "{{ role_path }}/templates/neutron_vpnaas.conf.j2"
-      - "{{ node_custom_config }}/neutron/neutron_vpnaas.conf"
-      - "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/neutron_vpnaas.conf"
-    dest: "{{ node_config_directory }}/{{ item }}/neutron_vpnaas.conf"
-  with_items:
-    - "neutron-server"
-
-- name: Copying over ml2_conf.ini
-  merge_configs:
-    vars:
-      service_name: "{{ item }}"
-    sources:
-      - "{{ role_path }}/templates/ml2_conf.ini.j2"
-      - "{{ node_custom_config }}/neutron/ml2_conf.ini"
-      - "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/ml2_conf.ini"
-    dest: "{{ node_config_directory }}/{{ item }}/ml2_conf.ini"
-  with_items:
-    - "neutron-dhcp-agent"
-    - "neutron-l3-agent"
-    - "neutron-linuxbridge-agent"
-    - "neutron-lbaas-agent"
-    - "neutron-metadata-agent"
-    - "neutron-openvswitch-agent"
-    - "neutron-server"
-    - "neutron-vpnaas-agent"
-
-- name: Copying over dhcp_agent.ini
-  merge_configs:
-    vars:
-      service_name: "{{ item }}"
-    sources:
-      - "{{ role_path }}/templates/dhcp_agent.ini.j2"
-      - "{{ node_custom_config }}/neutron/dhcp_agent.ini"
-    dest: "{{ node_config_directory }}/{{ item }}/dhcp_agent.ini"
-  with_items:
-    - "neutron-dhcp-agent"
-
-- name: Copying over dnsmasq.conf
-  template:
-    src: "dnsmasq.conf.j2"
-    dest: "{{ node_config_directory }}/{{ item }}/dnsmasq.conf"
-  with_items:
-    - "neutron-dhcp-agent"
-
-- name: Copying over l3_agent.ini
-  merge_configs:
-    vars:
-      service_name: "{{ item }}"
-    sources:
-      - "{{ role_path }}/templates/l3_agent.ini.j2"
-      - "{{ node_custom_config }}/neutron/l3_agent.ini"
-    dest: "{{ node_config_directory }}/{{ item }}/l3_agent.ini"
-  with_items:
-    - "neutron-l3-agent"
-    - "neutron-vpnaas-agent"
-
-- name: Copying over fwaas_driver.ini
-  merge_configs:
-    vars:
-      service_name: "{{ item }}"
-    sources:
-      - "{{ role_path }}/templates/fwaas_driver.ini.j2"
-      - "{{ node_custom_config }}/neutron/fwaas_driver.ini"
-    dest: "{{ node_config_directory }}/{{ item }}/fwaas_driver.ini"
-  with_items:
-    - "neutron-l3-agent"
-    - "neutron-vpnaas-agent"
-
-- name: Copying over metadata_agent.ini
-  merge_configs:
-    vars:
-      service_name: "{{ item }}"
-    sources:
-      - "{{ role_path }}/templates/metadata_agent.ini.j2"
-      - "{{ node_custom_config }}/neutron/metadata_agent.ini"
-    dest: "{{ node_config_directory }}/{{ item }}/metadata_agent.ini"
-  with_items:
-    - "neutron-metadata-agent"
-
-- name: Copying over lbaas_agent.ini
-  merge_configs:
-    vars:
-      service_name: "{{ item }}"
-    sources:
-      - "{{ role_path }}/templates/lbaas_agent.ini.j2"
-      - "{{ node_custom_config }}/neutron/lbaas_agent.ini"
-    dest: "{{ node_config_directory }}/{{ item }}/lbaas_agent.ini"
-  with_items:
-    - "neutron-lbaas-agent"
-
-- name: Copying over vpnaas_agent.ini
-  merge_configs:
-    vars:
-      service_name: "{{ item }}"
-    sources:
-      - "{{ role_path }}/templates/vpnaas_agent.ini.j2"
-      - "/etc/kolla/config/neutron/vpnaas_agent.ini"
-    dest: "{{ node_config_directory }}/{{ item }}/vpnaas_agent.ini"
-  with_items:
-    - "neutron-vpnaas-agent"
-
-- name: Check if policies shall be overwritten
-  local_action: stat path="{{ node_custom_config }}/neutron/policy.json"
-  register: neutron_policy
-
-- name: Copying over existing policy.json
-  template:
-    src: "{{ node_custom_config }}/neutron/policy.json"
-    dest: "{{ node_config_directory }}/{{ item }}/policy.json"
-  with_items:
-    - "neutron-dhcp-agent"
-    - "neutron-l3-agent"
-    - "neutron-linuxbridge-agent"
-    - "neutron-metadata-agent"
-    - "neutron-openvswitch-agent"
-    - "neutron-server"
-    - "neutron-lbaas-agent"
-    - "neutron-vpnaas-agent"
-  when:
-    neutron_policy.stat.exists
diff --git a/ansible/roles/neutron/tasks/deploy.yml b/ansible/roles/neutron/tasks/deploy.yml
deleted file mode 100644
index 7a75bdb20..000000000
--- a/ansible/roles/neutron/tasks/deploy.yml
+++ /dev/null
@@ -1,34 +0,0 @@
----
-# enforce ironic usage only with openvswitch
-- include: ironic-check.yml
-
-- include: register.yml
-  when: inventory_hostname in groups['neutron-server']
-
-- include: config.yml
-  when: inventory_hostname in groups['compute']
-        or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-        or inventory_hostname in groups['neutron-dhcp-agent']
-        or inventory_hostname in groups['neutron-l3-agent']
-        or inventory_hostname in groups['neutron-metadata-agent']
-        or inventory_hostname in groups['neutron-server']
-        or inventory_hostname in groups['neutron-lbaas-agent']
-        or inventory_hostname in groups['neutron-vpnaas-agent']
-
-- include: config-neutron-fake.yml
-  when:
-    - inventory_hostname in groups['compute']
-    - enable_nova_fake | bool
-
-- include: bootstrap.yml
-  when: inventory_hostname in groups['neutron-server']
-
-- include: start.yml
-  when: inventory_hostname in groups['compute']
-        or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-        or inventory_hostname in groups['neutron-dhcp-agent']
-        or inventory_hostname in groups['neutron-l3-agent']
-        or inventory_hostname in groups['neutron-metadata-agent']
-        or inventory_hostname in groups['neutron-server']
-        or inventory_hostname in groups['neutron-lbaas-agent']
-        or inventory_hostname in groups['neutron-vpnaas-agent']
diff --git a/ansible/roles/neutron/tasks/ironic-check.yml b/ansible/roles/neutron/tasks/ironic-check.yml
deleted file mode 100644
index a578ce2c7..000000000
--- a/ansible/roles/neutron/tasks/ironic-check.yml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-# TODO(SamYaple): run verification checks at start of playbook
-- fail: msg="neutron_plugin_agent must use openvswitch with Ironic"
-  when:
-    - enable_ironic | bool
-    - neutron_plugin_agent != "openvswitch"
diff --git a/ansible/roles/neutron/tasks/main.yml b/ansible/roles/neutron/tasks/main.yml
deleted file mode 100644
index b017e8b4a..000000000
--- a/ansible/roles/neutron/tasks/main.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-- include: "{{ action }}.yml"
diff --git a/ansible/roles/neutron/tasks/precheck.yml b/ansible/roles/neutron/tasks/precheck.yml
deleted file mode 100644
index ed97d539c..000000000
--- a/ansible/roles/neutron/tasks/precheck.yml
+++ /dev/null
@@ -1 +0,0 @@
----
diff --git a/ansible/roles/neutron/tasks/pull.yml b/ansible/roles/neutron/tasks/pull.yml
deleted file mode 100644
index fa6bf505e..000000000
--- a/ansible/roles/neutron/tasks/pull.yml
+++ /dev/null
@@ -1,84 +0,0 @@
----
-- name: Pulling neutron-dhcp-agent image
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ neutron_dhcp_agent_image_full }}"
-  when: inventory_hostname in groups['neutron-dhcp-agent']
-
-- name: Pulling neutron-l3-agent image
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ neutron_l3_agent_image_full }}"
-  when: inventory_hostname in groups['neutron-l3-agent']
-
-- name: Pulling neutron-linuxbridge-agent image
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ neutron_linuxbridge_agent_image_full }}"
-  when:
-    - (inventory_hostname in groups['compute']
-       or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-       or inventory_hostname in groups['neutron-dhcp-agent']
-       or inventory_hostname in groups['neutron-l3-agent']
-       or inventory_hostname in groups['neutron-metadata-agent']
-       or inventory_hostname in groups['neutron-vpnaas-agent'])
-    - neutron_plugin_agent == "linuxbridge"
-
-- name: Pulling neutron-metadata-agent image
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ neutron_metadata_agent_image_full }}"
-  when: inventory_hostname in groups['neutron-metadata-agent']
-
-- name: Pulling neutron-openvswitch-agent image
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ neutron_openvswitch_agent_image_full }}"
-  when:
-    - (inventory_hostname in groups['compute']
-       or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-       or inventory_hostname in groups['neutron-dhcp-agent']
-       or inventory_hostname in groups['neutron-l3-agent']
-       or inventory_hostname in groups['neutron-metadata-agent']
-       or inventory_hostname in groups['neutron-vpnaas-agent'])
-    - neutron_plugin_agent == "openvswitch"
-
-- name: Pulling neutron-server image
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ neutron_server_image_full }}"
-  when: inventory_hostname in groups['neutron-server']
-
-- name: Pulling openvswitch-db image
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ openvswitch_db_image_full }}"
-  when:
-    - (inventory_hostname in groups['compute']
-       or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-       or inventory_hostname in groups['neutron-dhcp-agent']
-       or inventory_hostname in groups['neutron-l3-agent']
-       or inventory_hostname in groups['neutron-metadata-agent']
-       or inventory_hostname in groups['neutron-vpnaas-agent'])
-    - neutron_plugin_agent == "openvswitch"
-
-- name: Pulling openvswitch-vswitchd image
-  kolla_docker:
-    action: "pull_image"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ openvswitch_vswitchd_image_full }}"
-  when:
-    - (inventory_hostname in groups['compute']
-       or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-       or inventory_hostname in groups['neutron-dhcp-agent']
-       or inventory_hostname in groups['neutron-l3-agent']
-       or inventory_hostname in groups['neutron-metadata-agent']
-       or inventory_hostname in groups['neutron-vpnaas-agent'])
-    - neutron_plugin_agent == "openvswitch"
diff --git a/ansible/roles/neutron/tasks/reconfigure.yml b/ansible/roles/neutron/tasks/reconfigure.yml
deleted file mode 100644
index ad8ef35ab..000000000
--- a/ansible/roles/neutron/tasks/reconfigure.yml
+++ /dev/null
@@ -1,324 +0,0 @@
----
-- name: Ensuring the containers running neutron-server and neutron agents are up
-  kolla_docker:
-    name: "{{ item.name }}"
-    action: "get_container_state"
-  register: neutron_container_states
-  failed_when: neutron_container_states.Running == false
-  when:
-    - "{{ item.enabled|default(True) }}"
-    - inventory_hostname in groups[item.group]
-  with_items:
-    - { name: neutron_server, group: neutron-server }
-    - { name: neutron_dhcp_agent, group: neutron-dhcp-agent }
-    - { name: neutron_l3_agent, group: neutron-l3-agent }
-    - { name: neutron_l3_agent, group: compute, enabled: "{{ enable_neutron_dvr | bool }}" }
-    - { name: neutron_lbaas_agent, group: neutron-lbaas-agent, enabled: "{{ enable_neutron_lbaas | bool }}" }
-    - { name: neutron_metadata_agent, group: neutron-metadata-agent }    
-    - { name: neutron_metadata_agent, group: compute, enabled: "{{ enable_neutron_dvr | bool }}" }
-    - { name: neutron_vpnaas_agent, group: neutron-vpnaas-agent, enabled: "{{ enable_neutron_vpnaas | bool }}" }
-
-- name: Ensuring the neutron_openvswitch_agent container is up
-  kolla_docker:
-    name: neutron_openvswitch_agent
-    action: "get_container_state"
-  register: openvswitch_agent_container_states
-  failed_when: openvswitch_agent_container_states.Running == false
-  when:
-    - neutron_plugin_agent == "openvswitch"
-    - (
-        ( inventory_hostname in groups['compute']
-          or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-          or inventory_hostname in groups['neutron-dhcp-agent']
-          or inventory_hostname in groups['neutron-l3-agent']
-          or inventory_hostname in groups['neutron-lbaas-agent']
-          or inventory_hostname in groups['neutron-metadata-agent']
-          or inventory_hostname in groups['neutron-vpnaas-agent']
-          and not enable_nova_fake | bool
-        ) or
-        ( inventory_hostname in groups['neutron-dhcp-agent']
-          or inventory_hostname in groups['neutron-l3-agent']
-          or inventory_hostname in groups['neutron-lbaas-agent']
-          or inventory_hostname in groups['neutron-metadata-agent']
-          or inventory_hostname in groups['neutron-vpnaas-agent']
-          and enable_nova_fake | bool
-        )
-      )
-
-- name: Ensuring the neutron_linuxbridge_agent container is up
-  kolla_docker:
-    name: neutron_linuxbridge_agent
-    action: "get_container_state"
-  register: linuxbridge_agent_container_states
-  failed_when: linuxbridge_agent_container_states.Running == false
-  when:
-    - neutron_plugin_agent == "linuxbridge"
-    - (inventory_hostname in groups['compute']
-       or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-       or inventory_hostname in groups['neutron-dhcp-agent']
-       or inventory_hostname in groups['neutron-l3-agent']
-       or inventory_hostname in groups['neutron-lbaas-agent']
-       or inventory_hostname in groups['neutron-metadata-agent']
-       or inventory_hostname in groups['neutron-vpnaas-agent'])
-
-- include: config.yml
-
-- name: Check the configs in containers running neutron-server and neutron agents
-  command: docker exec {{ item.name }} /usr/local/bin/kolla_set_configs --check
-  changed_when: false
-  failed_when: false
-  register: neutron_check_results
-  when:
-    - "{{ item.enabled|default(True) }}"
-    - inventory_hostname in groups[item.group]
-  with_items:
-    - { name: neutron_server, group: neutron-server }
-    - { name: neutron_dhcp_agent, group: neutron-dhcp-agent }
-    - { name: neutron_l3_agent, group: neutron-l3-agent }
-    - { name: neutron_l3_agent, group: compute, enabled: "{{ enable_neutron_dvr | bool }}" }
-    - { name: neutron_lbaas_agent, group: neutron-lbaas-agent, enabled: "{{ enable_neutron_lbaas | bool }}" }
-    - { name: neutron_metadata_agent, group: neutron-metadata-agent }
-    - { name: neutron_metadata_agent, group: compute, enabled: "{{ enable_neutron_dvr | bool }}" }
-    - { name: neutron_vpnaas_agent, group: neutron-vpnaas-agent, enabled: "{{ enable_neutron_vpnaas | bool }}" }
-
-- name: Check the configs in the neutron_openvswitch_agent container
-  command: docker exec neutron_openvswitch_agent /usr/local/bin/kolla_set_configs --check
-  changed_when: false
-  failed_when: false
-  register: openvswitch_agent_check_results
-  when:
-    - neutron_plugin_agent == "openvswitch"
-    - (
-        ( inventory_hostname in groups['compute']
-          or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-          or inventory_hostname in groups['neutron-dhcp-agent']
-          or inventory_hostname in groups['neutron-l3-agent']
-          or inventory_hostname in groups['neutron-lbaas-agent']
-          or inventory_hostname in groups['neutron-metadata-agent']
-          or inventory_hostname in groups['neutron-vpnaas-agent']
-          and not enable_nova_fake | bool
-        ) or
-        ( inventory_hostname in groups['neutron-dhcp-agent']
-          or inventory_hostname in groups['neutron-l3-agent']
-          or inventory_hostname in groups['neutron-lbaas-agent']
-          or inventory_hostname in groups['neutron-metadata-agent']
-          or inventory_hostname in groups['neutron-vpnaas-agent']
-          and enable_nova_fake | bool
-        )
-      )
-
-- name: Check the configs in the neutron_linuxbridge_agent container
-  command: docker exec neutron_linuxbridge_agent /usr/local/bin/kolla_set_configs --check
-  changed_when: false
-  failed_when: false
-  register: linuxbridge_agent_check_results
-  when:
-    - neutron_plugin_agent == "linuxbridge"
-    - (inventory_hostname in groups['compute']
-       or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-       or inventory_hostname in groups['neutron-dhcp-agent']
-       or inventory_hostname in groups['neutron-l3-agent']
-       or inventory_hostname in groups['neutron-lbaas-agent']
-       or inventory_hostname in groups['neutron-metadata-agent']
-       or inventory_hostname in groups['neutron-vpnaas-agent'])
-
-# NOTE(jeffrey4l): when config_strategy == 'COPY_ALWAYS'
-# and container env['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE',
-# just remove the container and start again
-- name: Containers config strategy for containers running neutron-server and neutron agents
-  kolla_docker:
-    name: "{{ item.name }}"
-    action: "get_container_env"
-  register: neutron_container_envs
-  when:
-    - "{{ item.enabled|default(True) }}"
-    - inventory_hostname in groups[item.group]
-  with_items:
-    - { name: neutron_server, group: neutron-server }
-    - { name: neutron_dhcp_agent, group: neutron-dhcp-agent }
-    - { name: neutron_l3_agent, group: neutron-l3-agent }
-    - { name: neutron_l3_agent, group: compute, enabled: "{{ enable_neutron_dvr | bool }}" }
-    - { name: neutron_lbaas_agent, group: neutron-lbaas-agent, enabled: "{{ enable_neutron_lbaas | bool }}" }
-    - { name: neutron_metadata_agent, group: neutron-metadata-agent }
-    - { name: neutron_metadata_agent, group: compute, enabled: "{{ enable_neutron_dvr | bool }}" }
-    - { name: neutron_vpnaas_agent, group: neutron-vpnaas-agent, enabled: "{{ enable_neutron_vpnaas | bool }}" }
-
-- name: Container config strategy for the neutron_openvswitch_agent container
-  kolla_docker:
-    name: "neutron_openvswitch_agent"
-    action: "get_container_env"
-  register: openvswitch_agent_envs
-  when:
-    - neutron_plugin_agent == "openvswitch"
-    - (
-        ( not enable_nova_fake | bool
-          and inventory_hostname in groups['compute']
-          or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-          or inventory_hostname in groups['neutron-dhcp-agent']
-          or inventory_hostname in groups['neutron-l3-agent']
-          or inventory_hostname in groups['neutron-lbaas-agent']
-          or inventory_hostname in groups['neutron-metadata-agent']
-          or inventory_hostname in groups['neutron-vpnaas-agent']
-        ) or
-        ( enable_nova_fake | bool
-          and inventory_hostname in groups['neutron-dhcp-agent']
-          or inventory_hostname in groups['neutron-l3-agent']
-          or inventory_hostname in groups['neutron-lbaas-agent']
-          or inventory_hostname in groups['neutron-metadata-agent']
-          or inventory_hostname in groups['neutron-vpnaas-agent']
-        )
-      )
-
-- name: Container config strategy for the neutron_linuxbridge_agent container
-  kolla_docker:
-    name: "neutron_linuxbridge_agent"
-    action: "get_container_env"
-  register: linuxbridge_agent_envs
-  when:
-    - neutron_plugin_agent == "linuxbridge"
-    - (inventory_hostname in groups['compute']
-       or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-       or inventory_hostname in groups['neutron-dhcp-agent']
-       or inventory_hostname in groups['neutron-l3-agent']
-       or inventory_hostname in groups['neutron-lbaas-agent']
-       or inventory_hostname in groups['neutron-metadata-agent']
-       or inventory_hostname in groups['neutron-vpnaas-agent'])
-
-- name: Remove the containers running neutron-server and neutron agents
-  kolla_docker:
-    name: "{{ item[0]['name'] }}"
-    action: "remove_container"
-  register: neutron_remove_containers
-  when:
-    - "{{ item[0].enabled | default(True) }}"
-    - inventory_hostname in groups[item[0]['group']]
-    - config_strategy == "COPY_ONCE" or item[1]['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE'
-    - item[2]['rc'] == 1
-  with_together:
-    - [{ name: neutron_server, group: neutron-server },
-       { name: neutron_dhcp_agent, group: neutron-dhcp-agent },
-       { name: neutron_l3_agent, group: neutron-l3-agent },
-       { name: neutron_l3_agent, group: compute, enabled: "{{ enable_neutron_dvr | bool }}" },
-       { name: neutron_lbaas_agent, group: neutron-lbaas-agent, enabled: "{{ enable_neutron_lbaas | bool }}" },
-       { name: neutron_metadata_agent, group: neutron-metadata-agent },
-       { name: neutron_metadata_agent, group: compute, enabled: "{{ enable_neutron_dvr | bool }}" },
-       { name: neutron_vpnaas_agent, group: neutron-vpnaas-agent, enabled: "{{ enable_neutron_vpnaas | bool }}" }]
-    - "{{ neutron_container_envs.results }}"
-    - "{{ neutron_check_results.results }}"
-
-- name: Remove the neutron_openvswitch_agent container
-  kolla_docker:
-    name: "neutron_openvswitch_agent"
-    action: "remove_container"
-  register: openvswitch_agent_remove_containers
-  when:
-    - neutron_plugin_agent == "openvswitch"
-    - (
-        ( not enable_nova_fake | bool
-          and inventory_hostname in groups['compute']
-          or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-          or inventory_hostname in groups['neutron-dhcp-agent']
-          or inventory_hostname in groups['neutron-l3-agent']
-          or inventory_hostname in groups['neutron-lbaas-agent']
-          or inventory_hostname in groups['neutron-metadata-agent']
-          or inventory_hostname in groups['neutron-vpnaas-agent']
-        ) or
-        ( enable_nova_fake | bool
-          and inventory_hostname in groups['neutron-dhcp-agent']
-          or inventory_hostname in groups['neutron-l3-agent']
-          or inventory_hostname in groups['neutron-lbaas-agent']
-          or inventory_hostname in groups['neutron-metadata-agent']
-          or inventory_hostname in groups['neutron-vpnaas-agent']
-        )
-      )
-    - config_strategy == "COPY_ONCE" or openvswitch_agent_envs['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE'
-    - openvswitch_agent_check_results['rc'] == 1
-
-- name: Remove the neutron_linuxbridge_agent container
-  kolla_docker:
-    name: "neutron_linuxbridge_agent"
-    action: "remove_container"
-  register: linuxbridge_agent_remove_containers
-  when:
-    - neutron_plugin_agent == "linuxbridge"
-    - (inventory_hostname in groups['compute']
-       or inventory_hostname in groups['manila-share']
-       or inventory_hostname in groups['neutron-dhcp-agent']
-       or inventory_hostname in groups['neutron-l3-agent']
-       or inventory_hostname in groups['neutron-lbaas-agent']
-       or inventory_hostname in groups['neutron-metadata-agent']
-       or inventory_hostname in groups['neutron-vpnaas-agent'])
-    - config_strategy == "COPY_ONCE" or linuxbridge_agent_envs['KOLLA_CONFIG_STRATEGY'] == 'COPY_ONCE'
-    - linuxbridge_agent_check_results['rc'] == 1
-
-- include: start.yml
-  when: neutron_remove_containers.changed
-        or openvswitch_agent_remove_containers.changed
-        or linuxbridge_agent_remove_containers.changed
-
-- name: Restart containers running neutron-server and neutron agents
-  kolla_docker:
-    name: "{{ item[0]['name'] }}"
-    action: "restart_container"
-  when:
-    - "{{ item[0].enabled|default(True) }}"
-    - config_strategy == 'COPY_ALWAYS'
-    - inventory_hostname in groups[item[0]['group']]
-    - item[1]['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE'
-    - item[2]['rc'] == 1
-  with_together:
-    - [{ name: neutron_server, group: neutron-server },
-       { name: neutron_dhcp_agent, group: neutron-dhcp-agent },
-       { name: neutron_l3_agent, group: neutron-l3-agent },
-       { name: neutron_l3_agent, group: compute, enabled: "{{ enable_neutron_dvr | bool }}" },
-       { name: neutron_lbaas_agent, group: neutron-lbaas-agent, enabled: "{{ enable_neutron_lbaas | bool }}" },
-       { name: neutron_metadata_agent, group: neutron-metadata-agent },
-       { name: neutron_metadata_agent, group: compute, enabled: "{{ enable_neutron_dvr | bool }}" },
-       { name: neutron_vpnaas_agent, group: neutron-vpnaas-agent, enabled: "{{ enable_neutron_vpnaas | bool }}" }]
-    - "{{ neutron_container_envs.results }}"
-    - "{{ neutron_check_results.results }}"
-
-- name: Restart the neutron_openvswitch_agent container
-  kolla_docker:
-    name: "neutron_openvswitch_agent"
-    action: "restart_container"
-  when:
-    - config_strategy == 'COPY_ALWAYS'
-    - neutron_plugin_agent == "openvswitch"
-    - (
-        ( inventory_hostname in groups['compute']
-          or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-          or inventory_hostname in groups['neutron-dhcp-agent']
-          or inventory_hostname in groups['neutron-l3-agent']
-          or inventory_hostname in groups['neutron-lbaas-agent']
-          or inventory_hostname in groups['neutron-metadata-agent']
-          or inventory_hostname in groups['neutron-vpnaas-agent']
-          and not enable_nova_fake | bool
-        ) or
-        ( inventory_hostname in groups['neutron-dhcp-agent']
-          or inventory_hostname in groups['neutron-l3-agent']
-          or inventory_hostname in groups['neutron-lbaas-agent']
-          or inventory_hostname in groups['neutron-metadata-agent']
-          or inventory_hostname in groups['neutron-vpnaas-agent']
-          and enable_nova_fake | bool
-        )
-      )
-    - openvswitch_agent_envs['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE'
-    - openvswitch_agent_check_results['rc'] == 1
-
-- name: Restart the neutron_linuxbridge_agent container
-  kolla_docker:
-    name: "neutron_linuxbridge_agent"
-    action: "restart_container"
-  when:
-    - config_strategy == 'COPY_ALWAYS'
-    - neutron_plugin_agent == "linuxbridge"
-    - (inventory_hostname in groups['compute']
-       or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-       or inventory_hostname in groups['neutron-dhcp-agent']
-       or inventory_hostname in groups['neutron-l3-agent']
-       or inventory_hostname in groups['neutron-lbaas-agent']
-       or inventory_hostname in groups['neutron-metadata-agent']
-       or inventory_hostname in groups['neutron-vpnaas-agent'])
-    - linuxbridge_agent_envs['KOLLA_CONFIG_STRATEGY'] != 'COPY_ONCE'
-    - linuxbridge_agent_check_results['rc'] == 1
diff --git a/ansible/roles/neutron/tasks/register.yml b/ansible/roles/neutron/tasks/register.yml
deleted file mode 100644
index fee70230e..000000000
--- a/ansible/roles/neutron/tasks/register.yml
+++ /dev/null
@@ -1,40 +0,0 @@
----
-- name: Creating the Neutron service and endpoint
-  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-    -m kolla_keystone_service
-    -a "service_name=neutron
-        service_type=network
-        description='Openstack Networking'
-        endpoint_region={{ openstack_region_name }}
-        url='{{ item.url }}'
-        interface='{{ item.interface }}'
-        region_name={{ openstack_region_name }}
-        auth={{ '{{ openstack_neutron_auth }}' }}"
-    -e "{'openstack_neutron_auth':{{ openstack_neutron_auth }}}"
-  register: neutron_endpoint
-  changed_when: "{{ neutron_endpoint.stdout.find('localhost | SUCCESS => ') != -1 and (neutron_endpoint.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
-  until: neutron_endpoint.stdout.split()[2] == 'SUCCESS'
-  retries: 10
-  delay: 5
-  run_once: True
-  with_items:
-    - {'interface': 'admin', 'url': '{{ neutron_admin_endpoint }}'}
-    - {'interface': 'internal', 'url': '{{ neutron_internal_endpoint }}'}
-    - {'interface': 'public', 'url': '{{ neutron_public_endpoint }}'}
-
-- name: Creating the Neutron project, user, and role
-  command: docker exec -t kolla_toolbox /usr/bin/ansible localhost
-    -m kolla_keystone_user
-    -a "project=service
-        user=neutron
-        password={{ neutron_keystone_password }}
-        role=admin
-        region_name={{ openstack_region_name }}
-        auth={{ '{{ openstack_neutron_auth }}' }}"
-    -e "{'openstack_neutron_auth':{{ openstack_neutron_auth }}}"
-  register: neutron_user
-  changed_when: "{{ neutron_user.stdout.find('localhost | SUCCESS => ') != -1 and (neutron_user.stdout.split('localhost | SUCCESS => ')[1]|from_json).changed }}"
-  until: neutron_user.stdout.split()[2] == 'SUCCESS'
-  retries: 10
-  delay: 5
-  run_once: True
diff --git a/ansible/roles/neutron/tasks/start.yml b/ansible/roles/neutron/tasks/start.yml
deleted file mode 100644
index 95f5e65d4..000000000
--- a/ansible/roles/neutron/tasks/start.yml
+++ /dev/null
@@ -1,302 +0,0 @@
----
-- name: Starting openvswitch-db container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ openvswitch_db_image_full }}"
-    name: "openvswitch_db"
-    volumes:
-      - "{{ node_config_directory }}/openvswitch-db-server/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "/run:/run:shared"
-      - "kolla_logs:/var/log/kolla/"
-      - "openvswitch_db:/var/lib/openvswitch/"
-  when:
-    - (inventory_hostname in groups['compute']
-       or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-       or inventory_hostname in groups['neutron-dhcp-agent']
-       or inventory_hostname in groups['neutron-l3-agent']
-       or inventory_hostname in groups['neutron-metadata-agent']
-       or inventory_hostname in groups['neutron-vpnaas-agent'])
-    - neutron_plugin_agent == "openvswitch"
-
-- name: Waiting the openvswitch_db service to be ready
-  command: docker exec openvswitch_db ovs-vsctl --no-wait show
-  register: check_result
-  until: check_result | success
-  changed_when: False
-  retries: 30
-  delay: 2
-  when:
-    - (inventory_hostname in groups['compute']
-       or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-       or inventory_hostname in groups['neutron-dhcp-agent']
-       or inventory_hostname in groups['neutron-l3-agent']
-       or inventory_hostname in groups['neutron-metadata-agent']
-       or inventory_hostname in groups['neutron-vpnaas-agent'])
-    - neutron_plugin_agent == "openvswitch"
-
-- name: Ensuring OVS bridge is properly setup
-  command: docker exec openvswitch_db /usr/local/bin/kolla_ensure_openvswitch_configured {{ item.0 }} {{ item.1 }}
-  register: status
-  changed_when: status.stdout.find('changed') != -1
-  when:
-    - (inventory_hostname in groups['compute']
-       or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-       or inventory_hostname in groups['neutron-dhcp-agent']
-       or inventory_hostname in groups['neutron-l3-agent']
-       or inventory_hostname in groups['neutron-metadata-agent']
-       or inventory_hostname in groups['neutron-vpnaas-agent'])
-    - neutron_plugin_agent == "openvswitch"
-  with_together:
-    - "{{ neutron_bridge_name.split(',') }}"
-    - "{{ neutron_external_interface.split(',') }}"
-
-- name: Starting openvswitch-vswitchd container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ openvswitch_vswitchd_image_full }}"
-    name: "openvswitch_vswitchd"
-    privileged: True
-    volumes:
-      - "{{ node_config_directory }}/openvswitch-vswitchd/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "/lib/modules:/lib/modules:ro"
-      - "/run:/run:shared"
-      - "kolla_logs:/var/log/kolla/"
-  when:
-    - (inventory_hostname in groups['compute']
-       or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-       or inventory_hostname in groups['neutron-dhcp-agent']
-       or inventory_hostname in groups['neutron-l3-agent']
-       or inventory_hostname in groups['neutron-metadata-agent']
-       or inventory_hostname in groups['neutron-vpnaas-agent'])
-    - neutron_plugin_agent == "openvswitch"
-
-- name: Starting neutron-server container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ neutron_server_image_full }}"
-    name: "neutron_server"
-    volumes:
-      - "{{ node_config_directory }}/neutron-server/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "kolla_logs:/var/log/kolla/"
-  when: inventory_hostname in groups['neutron-server']
-
-- name: Starting neutron-openvswitch-agent container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ neutron_openvswitch_agent_image_full }}"
-    name: "neutron_openvswitch_agent"
-    privileged: True
-    volumes:
-      - "{{ node_config_directory }}/neutron-openvswitch-agent/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "/lib/modules:/lib/modules:ro"
-      - "/run:/run:shared"
-      - "kolla_logs:/var/log/kolla/"
-  when:
-    - (
-        ( inventory_hostname in groups['compute']
-          or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-          or inventory_hostname in groups['neutron-dhcp-agent']
-          or inventory_hostname in groups['neutron-l3-agent']
-          or inventory_hostname in groups['neutron-metadata-agent']
-          or inventory_hostname in groups['neutron-vpnaas-agent']
-          and not enable_nova_fake | bool
-        ) or
-        ( inventory_hostname in groups['neutron-dhcp-agent']
-          or inventory_hostname in groups['neutron-l3-agent']
-          or inventory_hostname in groups['neutron-metadata-agent']
-          or inventory_hostname in groups['neutron-vpnaas-agent']
-          and enable_nova_fake | bool
-        )
-      )
-    - neutron_plugin_agent == "openvswitch"
-
-- name: Starting neutron-sfc-agent container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ neutron_sfc_agent_image_full }}"
-    name: "neutron_sfc_agent"
-    privileged: True
-    volumes:
-      - "{{ node_config_directory }}/neutron-sfc-agent/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "/lib/modules:/lib/modules:ro"
-      - "/run:/run:shared"
-      - "kolla_logs:/var/log/kolla/"
-  when:
-    - (
-        ( inventory_hostname in groups['compute']
-          or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-          or inventory_hostname in groups['neutron-dhcp-agent']
-          or inventory_hostname in groups['neutron-l3-agent']
-          or inventory_hostname in groups['neutron-metadata-agent']
-          and not enable_nova_fake | bool
-        ) or
-        ( inventory_hostname in groups['neutron-dhcp-agent']
-          or inventory_hostname in groups['neutron-l3-agent']
-          or inventory_hostname in groups['neutron-metadata-agent']
-          and enable_nova_fake | bool
-        )
-      )
-    - neutron_plugin_agent == "sfc"
-
-- name: Starting neutron-openvswitch-agent container for fake nova compute
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ neutron_openvswitch_agent_image_full }}"
-    name: "neutron_openvswitch_agent_fake_{{ item }}"
-    privileged: True
-    volumes:
-      - "{{ node_config_directory }}/neutron-openvswitch-agent-fake-{{ item }}/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "/lib/modules:/lib/modules:ro"
-      - "/run:/run:shared"
-      - "kolla_logs:/var/log/kolla/"
-  with_sequence: start=1 end={{ num_nova_fake_per_node }}
-  when:
-    - inventory_hostname in groups['compute']
-    - neutron_plugin_agent == "openvswitch"
-    - enable_nova_fake | bool
-
-- name: Starting neutron-sfc-agent container for fake nova compute
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ neutron_sfc_agent_image_full }}"
-    name: "neutron_sfc_agent_fake_{{ item }}"
-    privileged: True
-    volumes:
-      - "{{ node_config_directory }}/neutron-sfc-agent-fake-{{ item }}/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "/lib/modules:/lib/modules:ro"
-      - "/run:/run:shared"
-      - "kolla_logs:/var/log/kolla/"
-  with_sequence: start=1 end={{ num_nova_fake_per_node }}
-  when:
-    - inventory_hostname in groups['compute']
-    - neutron_plugin_agent == "sfc"
-    - enable_nova_fake | bool
-
-- name: Starting neutron-linuxbridge-agent container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    environment:
-      KOLLA_CONFIG_STRATEGY: "{{ config_strategy }}"
-      NEUTRON_BRIDGE: "br-ex"
-      NEUTRON_INTERFACE: "{{ neutron_external_interface }}"
-    image: "{{ neutron_linuxbridge_agent_image_full }}"
-    name: "neutron_linuxbridge_agent"
-    privileged: True
-    volumes:
-      - "{{ node_config_directory }}/neutron-linuxbridge-agent/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "/lib/modules:/lib/modules:ro"
-      - "/run:/run:shared"
-      - "kolla_logs:/var/log/kolla/"
-  when:
-    - (inventory_hostname in groups['compute']
-       or (enable_manila | bool and inventory_hostname in groups['manila-share'])
-       or inventory_hostname in groups['neutron-dhcp-agent']
-       or inventory_hostname in groups['neutron-l3-agent']
-       or inventory_hostname in groups['neutron-metadata-agent']
-       or inventory_hostname in groups['neutron-vpnaas-agent'])
-    - neutron_plugin_agent == "linuxbridge"
-
-- name: Starting neutron-dhcp-agent container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ neutron_dhcp_agent_image_full }}"
-    name: "neutron_dhcp_agent"
-    privileged: True
-    volumes:
-      - "{{ node_config_directory }}/neutron-dhcp-agent/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "/run/:/run/:shared"
-      - "/run/netns/:/run/netns/:shared"
-      - "neutron_metadata_socket:/var/lib/neutron/kolla/"
-      - "kolla_logs:/var/log/kolla/"
-  when:
-    - inventory_hostname in groups['neutron-dhcp-agent']
-
-- name: Starting neutron-l3-agent container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ neutron_l3_agent_image_full }}"
-    name: "neutron_l3_agent"
-    privileged: True
-    volumes:
-      - "{{ node_config_directory }}/neutron-l3-agent/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "/run:/run:shared"
-      - "/run/netns/:/run/netns/:shared"
-      - "neutron_metadata_socket:/var/lib/neutron/kolla/"
-      - "kolla_logs:/var/log/kolla/"
-  when:
-    - (inventory_hostname in groups['neutron-l3-agent']
-       or (inventory_hostname in groups['compute'] and enable_neutron_dvr | bool))
-    - not enable_neutron_vpnaas | bool
-
-- name: Starting neutron-lbaas-agent container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ neutron_lbaas_agent_image_full }}"
-    name: "neutron_lbaas_agent"
-    privileged: True
-    volumes:
-      - "{{ node_config_directory }}/neutron-lbaas-agent/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "/run:/run:shared"
-      - "/run/netns/:/run/netns/:shared"
-      - "neutron_metadata_socket:/var/lib/neutron/kolla/"
-      - "kolla_logs:/var/log/kolla/"
-  when:
-    - enable_neutron_lbaas | bool
-    - inventory_hostname in groups['neutron-lbaas-agent']
-
-- name: Starting neutron-metadata-agent container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ neutron_metadata_agent_image_full }}"
-    name: "neutron_metadata_agent"
-    privileged: True
-    volumes:
-      - "{{ node_config_directory }}/neutron-metadata-agent/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "/run/netns/:/run/netns/:shared"
-      - "neutron_metadata_socket:/var/lib/neutron/kolla/"
-      - "kolla_logs:/var/log/kolla/"
-  when:
-    - (inventory_hostname in groups['neutron-metadata-agent']
-       or (inventory_hostname in groups['compute'] and enable_neutron_dvr | bool))
-
-- name: Starting neutron-vpnaas-agent container
-  kolla_docker:
-    action: "start_container"
-    common_options: "{{ docker_common_options }}"
-    image: "{{ neutron_vpnaas_agent_image_full }}"
-    name: "neutron_vpnaas_agent"
-    privileged: True
-    volumes:
-      - "{{ node_config_directory }}/neutron-vpnaas-agent/:{{ container_config_directory }}/:ro"
-      - "/etc/localtime:/etc/localtime:ro"
-      - "/run:/run:shared"
-      - "/run/netns/:/run/netns/:shared"
-      - "neutron_metadata_socket:/var/lib/neutron/kolla/"
-      - "kolla_logs:/var/log/kolla/"
-  when:
-    - enable_neutron_vpnaas | bool
-    - inventory_hostname in groups['neutron-vpnaas-agent']
diff --git a/ansible/roles/neutron/tasks/upgrade.yml b/ansible/roles/neutron/tasks/upgrade.yml
deleted file mode 100644
index 84b6f5b56..000000000
--- a/ansible/roles/neutron/tasks/upgrade.yml
+++ /dev/null
@@ -1,26 +0,0 @@
----
-- include: config.yml
-  when: inventory_hostname in groups['compute']
-        or inventory_hostname in groups['neutron-dhcp-agent']
-        or inventory_hostname in groups['neutron-l3-agent']
-        or inventory_hostname in groups['neutron-lbaas-agent']
-        or inventory_hostname in groups['neutron-metadata-agent']
-        or inventory_hostname in groups['neutron-server']
-        or inventory_hostname in groups['neutron-vpnaas-agent']
-
-- include: config-neutron-fake.yml
-  when:
-    - inventory_hostname in groups['compute']
-    - enable_nova_fake | bool
-
-- include: bootstrap_service.yml
-  when: inventory_hostname in groups['neutron-server']
-
-- include: start.yml
-  when: inventory_hostname in groups['compute']
-        or inventory_hostname in groups['neutron-dhcp-agent']
-        or inventory_hostname in groups['neutron-l3-agent']
-        or inventory_hostname in groups['neutron-lbaas-agent']
-        or inventory_hostname in groups['neutron-metadata-agent']
-        or inventory_hostname in groups['neutron-server']
-        or inventory_hostname in groups['neutron-vpnaas-agent']