1 files changed, 14 insertions, 2 deletions
diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/odl_controller.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/odl_controller.yml
index 9de5f478..4cf7948a 100755
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/odl_controller.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/odl_controller.yml
@@ -89,11 +89,21 @@
 
 - name: create karaf config
   template:
-    src: org.apache.karaf.features.cfg
+    src: org.apache.karaf.features.cfg.Debian
     dest: "{{ odl_home }}/etc/org.apache.karaf.features.cfg"
     owner: odl
     group: odl
     mode: 0775
+  when: ansible_os_family == "Debian"
+
+- name: create karaf config
+  template:
+    src: org.apache.karaf.features.cfg.Redhat
+    dest: "{{ odl_home }}/etc/org.apache.karaf.features.cfg"
+    owner: odl
+    group: odl
+    mode: 0775
+  when: ansible_os_family == "RedHat"
 
 - name: create tomcat config
   template:
@@ -269,7 +279,9 @@
   shell: crudini --set /etc/neutron/neutron.conf DEFAULT service_plugins networking_odl.l3.l3_odl.OpenDaylightL3RouterPlugin;
   when: odl_l3_agent == "Enable"
 
-
+- name: configure metadata for l3 configuration
+  shell: crudini --set /etc/neutron/dhcp_agent.ini DEFAULT enable_isolated_metadata True;
+  when: odl_l3_agent == "Enable"
 
 - name: drop and recreate neutron database
   shell: mysql -e "drop database if exists neutron;";