bugfix:enable metadata in DHCP for odl l3

JIRA: COMPASS-476

Change-Id: Ie9734c6b8304a40fbb24e9f6230801c00289d36f
Signed-off-by: chenshuai@huawei.com <chenshuai@huawei.com>
(cherry picked from commit e09136c215f9166a98ced9bcced6e068a3ed73d4)

diff --git a/deploy/adapters/ansible/openstack_liberty/roles/odl_cluster/tasks/odl_controller.yml b/deploy/adapters/ansible/openstack_liberty/roles/odl_cluster/tasks/odl_controller.yml
index dff7d00..3c7032d 100755 (executable)
--- a/deploy/adapters/ansible/openstack_liberty/roles/odl_cluster/tasks/odl_controller.yml
+++ b/deploy/adapters/ansible/openstack_liberty/roles/odl_cluster/tasks/odl_controller.yml
@@ -237,7 +237,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;";

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 9de5f47..b304b71 100755 (executable)
--- 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
@@ -269,7 +269,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;";

diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/openvswitch.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/openvswitch.yml
index ee477a3..b8cb6c9 100755 (executable)
--- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/openvswitch.yml
+++ b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/odl_cluster/tasks/openvswitch.yml
@@ -152,7 +152,7 @@
 - name: execute ml2 configuration script
   command: su -s /bin/sh -c "/opt/ml2_conf.sh;"
 
-- name: change odl password for moon
-  shell: crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2_odl password {{ ADMIN_PASS }} 
-  when: moon == "Enable"
+#- name: change odl password for moon
+#  shell: crudini --set /etc/neutron/plugins/ml2/ml2_conf.ini ml2_odl password {{ ADMIN_PASS }} 
+#  when: moon == "Enable"
 

diff --git a/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml
index 15513b3..624ae58 100755 (executable)
--- a/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml
+++ b/deploy/adapters/ansible/roles/odl_cluster/tasks/odl_controller.yml
@@ -256,7 +256,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;";