2 files changed, 27 insertions, 0 deletions
diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_03_copy_odl_configuration_files.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_03_copy_odl_configuration_files.yml
index f4e87955..41aca7ee 100644
--- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_03_copy_odl_configuration_files.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_03_copy_odl_configuration_files.yml
@@ -40,6 +40,15 @@
     mode: 0775
   when: ansible_os_family == "RedHat"
 
+- name: copy acl configuration script
+  template:
+    src: acl_conf.sh
+    dest: "/opt/acl_conf.sh"
+    mode: 0777
+
+- name: execute acl configuration script
+  command: su -s /bin/sh -c "/opt/acl_conf.sh;"
+
 - name: create tomcat config
   template:
     src: tomcat-server.xml
diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_08_configure_neutron.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_08_configure_neutron.yml
index 12c1fd25..5135c8cf 100644
--- a/deploy/adapters/ansible/roles/odl_cluster/tasks/01_08_configure_neutron.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/01_08_configure_neutron.yml
@@ -32,6 +32,24 @@
         enable_isolated_metadata "True";
   when: odl_l3_agent == "Enable"
 
+- name: force metadata for l3 configuration
+  shell: |
+    crudini --set /etc/neutron/dhcp_agent.ini DEFAULT \
+        force_metadata "True";
+  when: odl_l3_agent == "Enable"
+
+- name: stop neutron l3 agent
+  service: name=neutron-l3-agent state=stopped enabled=no
+  when: odl_l3_agent == "Enable" and inventory_hostname in groups['odl']
+
+- name: remove neutron l3 agent
+  shell: >
+    sed -i '/neutron-l3-agent/d' /opt/service;
+    rm -rf /lib/systemd/system/neutron-l3-agent.service;
+    rm -rf /etc/init/neutron-l3-agent.conf;
+    rm -rf /etc/init.d/neutron-l3-agent;
+  when: odl_l3_agent == "Enable" and inventory_hostname in groups['odl']
+
 - name: drop and recreate neutron database
   shell: |
     mysql -e "drop database if exists neutron;";